Merge iSeries include file move

diff --combined arch/powerpc/kernel/setup_64.c
index 70ead7d,079867e..d4a3c5d
--- 1/arch/powerpc/kernel/setup_64.c
--- 2/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@@ -56,7 -56,7 +56,7 @@@
  #include <asm/page.h>
  #include <asm/mmu.h>
  #include <asm/lmb.h>
- #include <asm/iSeries/ItLpNaca.h>
+ #include <asm/iseries/it_lp_naca.h>
  #include <asm/firmware.h>
  #include <asm/systemcfg.h>
  #include <asm/xmon.h>
@@@ -296,7 -296,7 +296,7 @@@ static void __init setup_cpu_maps(void
  extern struct machdep_calls pSeries_md;
  extern struct machdep_calls pmac_md;
  extern struct machdep_calls maple_md;
 -extern struct machdep_calls bpa_md;
 +extern struct machdep_calls cell_md;
  extern struct machdep_calls iseries_md;
  
  /* Ultimately, stuff them in an elf section like initcalls... */
@@@ -310,8 -310,8 +310,8 @@@ static struct machdep_calls __initdata 
  #ifdef CONFIG_PPC_MAPLE
        &maple_md,
  #endif /* CONFIG_PPC_MAPLE */
 -#ifdef CONFIG_PPC_BPA
 -      &bpa_md,
 +#ifdef CONFIG_PPC_CELL
 +      &cell_md,
  #endif
  #ifdef CONFIG_PPC_ISERIES
        &iseries_md,
@@@ -631,6 -631,23 +631,6 @@@ static int ppc64_panic_event(struct not
        return NOTIFY_DONE;
  }
  
 -#ifdef CONFIG_PPC_ISERIES
 -/*
 - * On iSeries we just parse the mem=X option from the command line.
 - * On pSeries it's a bit more complicated, see prom_init_mem()
 - */
 -static int __init early_parsemem(char *p)
 -{
 -      if (!p)
 -              return 0;
 -
 -      memory_limit = ALIGN(memparse(p, &p), PAGE_SIZE);
 -
 -      return 0;
 -}
 -early_param("mem", early_parsemem);
 -#endif /* CONFIG_PPC_ISERIES */
 -
  #ifdef CONFIG_IRQSTACKS
  static void __init irqstack_early_init(void)
  {

diff --combined arch/powerpc/platforms/iseries/setup.c
index 06431e6,d955e95..8e5ef62
--- 1/arch/powerpc/platforms/iseries/setup.c
--- 2/arch/powerpc/platforms/iseries/setup.c
+++ b/arch/powerpc/platforms/iseries/setup.c
@@@ -27,7 -27,6 +27,7 @@@
  #include <linux/kdev_t.h>
  #include <linux/major.h>
  #include <linux/root_dev.h>
 +#include <linux/kernel.h>
  
  #include <asm/processor.h>
  #include <asm/machdep.h>
@@@ -46,13 -45,13 +46,13 @@@
  #include <asm/cache.h>
  #include <asm/sections.h>
  #include <asm/abs_addr.h>
- #include <asm/iSeries/HvLpConfig.h>
- #include <asm/iSeries/HvCallEvent.h>
- #include <asm/iSeries/HvCallXm.h>
- #include <asm/iSeries/ItLpQueue.h>
- #include <asm/iSeries/mf.h>
- #include <asm/iSeries/HvLpEvent.h>
- #include <asm/iSeries/LparMap.h>
+ #include <asm/iseries/hv_lp_config.h>
+ #include <asm/iseries/hv_call_event.h>
+ #include <asm/iseries/hv_call_xm.h>
+ #include <asm/iseries/it_lp_queue.h>
+ #include <asm/iseries/mf.h>
+ #include <asm/iseries/hv_lp_event.h>
+ #include <asm/iseries/lpar_map.h>
  
  #include "setup.h"
  #include "irq.h"
@@@ -95,8 -94,6 +95,8 @@@ extern unsigned long iSeries_recal_tita
  
  static int mf_initialized;
  
 +static unsigned long cmd_mem_limit;
 +
  struct MemoryBlock {
        unsigned long absStart;
        unsigned long absEnd;
@@@ -344,6 -341,23 +344,6 @@@ static void __init iSeries_init_early(v
         */
        iommu_init_early_iSeries();
  
 -      iSeries_get_cmdline();
 -
 -      /* Save unparsed command line copy for /proc/cmdline */
 -      strlcpy(saved_command_line, cmd_line, COMMAND_LINE_SIZE);
 -
 -      /* Parse early parameters, in particular mem=x */
 -      parse_early_param();
 -
 -      if (memory_limit) {
 -              if (memory_limit < systemcfg->physicalMemorySize)
 -                      systemcfg->physicalMemorySize = memory_limit;
 -              else {
 -                      printk("Ignoring mem=%lu >= ram_top.\n", memory_limit);
 -                      memory_limit = 0;
 -              }
 -      }
 -
        /* Initialize machine-dependency vectors */
  #ifdef CONFIG_SMP
        smp_init_iSeries();
@@@ -957,8 -971,6 +957,8 @@@ void build_flat_dt(struct iseries_flat_
        /* /chosen */
        dt_start_node(dt, "chosen");
        dt_prop_u32(dt, "linux,platform", PLATFORM_ISERIES_LPAR);
 +      if (cmd_mem_limit)
 +              dt_prop_u64(dt, "linux,memory-limit", cmd_mem_limit);
        dt_end_node(dt);
  
        dt_cpus(dt);
@@@ -978,27 -990,7 +978,27 @@@ void * __init iSeries_early_setup(void
         */
        build_iSeries_Memory_Map();
  
 +      iSeries_get_cmdline();
 +
 +      /* Save unparsed command line copy for /proc/cmdline */
 +      strlcpy(saved_command_line, cmd_line, COMMAND_LINE_SIZE);
 +
 +      /* Parse early parameters, in particular mem=x */
 +      parse_early_param();
 +
        build_flat_dt(&iseries_dt);
  
        return (void *) __pa(&iseries_dt);
  }
 +
 +/*
 + * On iSeries we just parse the mem=X option from the command line.
 + * On pSeries it's a bit more complicated, see prom_init_mem()
 + */
 +static int __init early_parsemem(char *p)
 +{
 +      if (p)
 +              cmd_mem_limit = ALIGN(memparse(p, &p), PAGE_SIZE);
 +      return 0;
 +}
 +early_param("mem", early_parsemem);

diff --combined arch/ppc64/kernel/irq.c
index b072ed6,310931d..8747458
--- 1/arch/ppc64/kernel/irq.c
--- 2/arch/ppc64/kernel/irq.c
+++ b/arch/ppc64/kernel/irq.c
@@@ -52,7 -52,7 +52,7 @@@
  #include <asm/cache.h>
  #include <asm/prom.h>
  #include <asm/ptrace.h>
- #include <asm/iSeries/ItLpQueue.h>
+ #include <asm/iseries/it_lp_queue.h>
  #include <asm/machdep.h>
  #include <asm/paca.h>
  
@@@ -392,7 -392,7 +392,7 @@@ int virt_irq_create_mapping(unsigned in
        if (ppc64_interrupt_controller == IC_OPEN_PIC)
                return real_irq;        /* no mapping for openpic (for now) */
  
 -      if (ppc64_interrupt_controller == IC_BPA_IIC)
 +      if (ppc64_interrupt_controller == IC_CELL_PIC)
                return real_irq;        /* no mapping for iic either */
  
        /* don't map interrupts < MIN_VIRT_IRQ */