Merge git://oak/home/sfr/kernels/iseries/work

diff --combined arch/powerpc/kernel/prom.c
index 6391a4a,fd3bcb4..6a5b468
--- 1/arch/powerpc/kernel/prom.c
--- 2/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@@ -71,6 -71,10 +71,6 @@@ struct isa_reg_property 
  typedef int interpret_func(struct device_node *, unsigned long *,
                           int, int, int);
  
 -extern struct rtas_t rtas;
 -extern struct lmb lmb;
 -extern unsigned long klimit;
 -
  static int __initdata dt_root_addr_cells;
  static int __initdata dt_root_size_cells;
  
@@@ -1080,9 -1084,9 +1080,9 @@@ void __init unflatten_device_tree(void
  static int __init early_init_dt_scan_cpus(unsigned long node,
                                          const char *uname, int depth, void *data)
  {
-       char *type = of_get_flat_dt_prop(node, "device_type", NULL);
        u32 *prop;
-       unsigned long size = 0;
+       unsigned long size;
+       char *type = of_get_flat_dt_prop(node, "device_type", &size);
  
        /* We are scanning "cpu" nodes only */
        if (type == NULL || strcmp(type, "cpu") != 0)
@@@ -1108,7 -1112,7 +1108,7 @@@
  
  #ifdef CONFIG_ALTIVEC
        /* Check if we have a VMX and eventually update CPU features */
-       prop = (u32 *)of_get_flat_dt_prop(node, "ibm,vmx", &size);
+       prop = (u32 *)of_get_flat_dt_prop(node, "ibm,vmx", NULL);
        if (prop && (*prop) > 0) {
                cur_cpu_spec->cpu_features |= CPU_FTR_ALTIVEC;
                cur_cpu_spec->cpu_user_features |= PPC_FEATURE_HAS_ALTIVEC;

diff --combined arch/powerpc/platforms/iseries/setup.c
index 1f33834,19b415f..6a29f30
--- 1/arch/powerpc/platforms/iseries/setup.c
--- 2/arch/powerpc/platforms/iseries/setup.c
+++ b/arch/powerpc/platforms/iseries/setup.c
@@@ -40,7 -40,7 +40,7 @@@
  #include <asm/iommu.h>
  #include <asm/firmware.h>
  #include <asm/systemcfg.h>
 -
 +#include <asm/system.h>
  #include <asm/time.h>
  #include <asm/paca.h>
  #include <asm/cache.h>
@@@ -85,6 -85,7 +85,6 @@@ static void iSeries_pci_final_fixup(voi
  int piranha_simulator;
  
  extern int rd_size;           /* Defined in drivers/block/rd.c */
 -extern unsigned long klimit;
  extern unsigned long embedded_sysmap_start;
  extern unsigned long embedded_sysmap_end;
  
@@@ -704,7 -705,6 +704,6 @@@ static void iseries_shared_idle(void
  
  static void iseries_dedicated_idle(void)
  {
-       long oldval;
        set_thread_flag(TIF_POLLING_NRFLAG);
  
        while (1) {