7 files changed, 38 insertions, 30 deletions

diff --git a/arch/powerpc/platforms/cell/spufs/switch.c b/arch/powerpc/platforms/cell/spufs/switch.c
index 97898d5d34e5..1726bfe38ee0 100644
--- a/arch/powerpc/platforms/cell/spufs/switch.c
+++ b/arch/powerpc/platforms/cell/spufs/switch.c
@@ -1297,7 +1297,7 @@ static inline void setup_decr(struct spu_state *csa, struct spu *spu)
                 cycles_t resume_time = get_cycles();
                 cycles_t delta_time = resume_time - csa->suspend_time;
 
-                csa->lscsa->decr.slot[0] = delta_time;
+                csa->lscsa->decr.slot[0] -= delta_time;
         }
 }
 
diff --git a/arch/powerpc/platforms/chrp/chrp.h b/arch/powerpc/platforms/chrp/chrp.h
index 63f0aee4c158..996c28744e96 100644
--- a/arch/powerpc/platforms/chrp/chrp.h
+++ b/arch/powerpc/platforms/chrp/chrp.h
@@ -9,3 +9,4 @@ extern long chrp_time_init(void);
 
 extern void chrp_find_bridges(void);
 extern void chrp_event_scan(unsigned long);
+extern void chrp_pcibios_fixup(void);
diff --git a/arch/powerpc/platforms/chrp/pci.c b/arch/powerpc/platforms/chrp/pci.c
index 8ef279ad36ad..ac224876ce59 100644
--- a/arch/powerpc/platforms/chrp/pci.c
+++ b/arch/powerpc/platforms/chrp/pci.c
@@ -23,6 +23,8 @@
 #include <asm/grackle.h>
 #include <asm/rtas.h>
 
+#include "chrp.h"
+
 /* LongTrail */
 void __iomem *gg2_pci_config_base;
 
@@ -314,6 +316,6 @@ chrp_find_bridges(void)
         }
 
         /* Do not fixup interrupts from OF tree on pegasos */
-        if (is_pegasos == 0)
-                ppc_md.pcibios_fixup = chrp_pcibios_fixup;
+        if (is_pegasos)
+                ppc_md.pcibios_fixup = NULL;
 }
diff --git a/arch/powerpc/platforms/chrp/setup.c b/arch/powerpc/platforms/chrp/setup.c
index 23a201718704..18d89f38796b 100644
--- a/arch/powerpc/platforms/chrp/setup.c
+++ b/arch/powerpc/platforms/chrp/setup.c
@@ -440,8 +440,6 @@ void __init chrp_init_IRQ(void)
 
         if (_chrp_type == _CHRP_Pegasos)
                 ppc_md.get_irq        = i8259_irq;
-        else
-                ppc_md.get_irq        = mpic_get_irq;
 
 #if defined(CONFIG_VT) && defined(CONFIG_INPUT_ADBHID) && defined(XMON)
         /* see if there is a keyboard in the device tree
@@ -528,26 +526,24 @@ static int __init chrp_probe(void)
         /* Assume we have an 8259... */
         __irq_offset_value = NUM_ISA_INTERRUPTS;
 
-        ppc_md.setup_arch     = chrp_setup_arch;
-        ppc_md.show_cpuinfo   = chrp_show_cpuinfo;
-
-        ppc_md.init_IRQ       = chrp_init_IRQ;
-        ppc_md.init           = chrp_init2;
-
-        ppc_md.phys_mem_access_prot = pci_phys_mem_access_prot;
-
-        ppc_md.restart        = rtas_restart;
-        ppc_md.power_off      = rtas_power_off;
-        ppc_md.halt           = rtas_halt;
-
-        ppc_md.time_init      = chrp_time_init;
-        ppc_md.calibrate_decr = generic_calibrate_decr;
-
-        /* this may get overridden with rtas routines later... */
-        ppc_md.set_rtc_time   = chrp_set_rtc_time;
-        ppc_md.get_rtc_time   = chrp_get_rtc_time;
-
-#ifdef CONFIG_SMP
-        smp_ops = &chrp_smp_ops;
-#endif /* CONFIG_SMP */
+        return 1;
 }
+
+define_machine(chrp) {
+        .name                   = "CHRP",
+        .probe                  = chrp_probe,
+        .setup_arch             = chrp_setup_arch,
+        .init                   = chrp_init2,
+        .show_cpuinfo           = chrp_show_cpuinfo,
+        .init_IRQ               = chrp_init_IRQ,
+        .get_irq                = mpic_get_irq,
+        .pcibios_fixup          = chrp_pcibios_fixup,
+        .restart                = rtas_restart,
+        .power_off              = rtas_power_off,
+        .halt                   = rtas_halt,
+        .time_init              = chrp_time_init,
+        .set_rtc_time           = chrp_set_rtc_time,
+        .get_rtc_time           = chrp_get_rtc_time,
+        .calibrate_decr         = generic_calibrate_decr,
+        .phys_mem_access_prot   = pci_phys_mem_access_prot,
+};
diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c
index 6ce8a404ba6b..a6fd9bedb074 100644
--- a/arch/powerpc/platforms/iseries/setup.c
+++ b/arch/powerpc/platforms/iseries/setup.c
@@ -54,6 +54,7 @@
 #include <asm/iseries/hv_lp_event.h>
 #include <asm/iseries/lpar_map.h>
 #include <asm/udbg.h>
+#include <asm/irq.h>
 
 #include "naca.h"
 #include "setup.h"
@@ -684,6 +685,12 @@ static int __init iseries_probe(void)
         powerpc_firmware_features |= FW_FEATURE_ISERIES;
         powerpc_firmware_features |= FW_FEATURE_LPAR;
 
+        /*
+         * The Hypervisor only allows us up to 256 interrupt
+         * sources (the irq number is passed in a u8).
+         */
+        virt_irq_max = 255;
+
         return 1;
 }
 
diff --git a/arch/powerpc/platforms/pseries/eeh.c b/arch/powerpc/platforms/pseries/eeh.c
index 780fb27a0099..32eaddfa5470 100644
--- a/arch/powerpc/platforms/pseries/eeh.c
+++ b/arch/powerpc/platforms/pseries/eeh.c
@@ -957,8 +957,10 @@ static void eeh_remove_device(struct pci_dev *dev)
         pci_addr_cache_remove_device(dev);
 
         dn = pci_device_to_OF_node(dev);
-        PCI_DN(dn)->pcidev = NULL;
-        pci_dev_put (dev);
+        if (PCI_DN(dn)->pcidev) {
+                PCI_DN(dn)->pcidev = NULL;
+                pci_dev_put (dev);
+        }
 }
 
 void eeh_remove_bus_device(struct pci_dev *dev)
diff --git a/arch/powerpc/platforms/pseries/rtasd.c b/arch/powerpc/platforms/pseries/rtasd.c
index fcc4d561a236..e0000ce769e5 100644
--- a/arch/powerpc/platforms/pseries/rtasd.c
+++ b/arch/powerpc/platforms/pseries/rtasd.c
@@ -488,7 +488,7 @@ static int __init rtas_init(void)
         /* No RTAS */
         if (rtas_token("event-scan") == RTAS_UNKNOWN_SERVICE) {
                 printk(KERN_INFO "rtasd: no event-scan on system\n");
-                return 1;
+                return -ENODEV;
         }
 
         entry = create_proc_entry("ppc64/rtas/error_log", S_IRUSR, NULL);