ppc64: move stack switching up in interrupt processing

[karo-tx-linux.git] / arch / ppc64 / kernel / prom_init.c

diff --git a/arch/ppc64/kernel/prom_init.c b/arch/ppc64/kernel/prom_init.c
index f252670874a4b0d027b7fa736e8d0876f12475de..e4c880dab997bf9cc7baeb33efe3cd54bcca22fc 100644 (file)
--- a/arch/ppc64/kernel/prom_init.c
+++ b/arch/ppc64/kernel/prom_init.c
@@ -44,8 +44,6 @@
 #include <asm/pgtable.h>
 #include <asm/pci.h>
 #include <asm/iommu.h>
-#include <asm/bootinfo.h>
-#include <asm/ppcdebug.h>
 #include <asm/btext.h>
 #include <asm/sections.h>
 #include <asm/machdep.h>
@@ -1826,7 +1824,7 @@ static void __init fixup_device_tree(void)
        if (prom_getprop(u3, "device-rev", &u3_rev, sizeof(u3_rev))
            == PROM_ERROR)
                return;
-       if (u3_rev != 0x35 && u3_rev != 0x37)
+       if (u3_rev < 0x35 || u3_rev > 0x39)
                return;
        /* does it need fixup ? */
        if (prom_getproplen(i2c, "interrupts") > 0)
@@ -1940,9 +1938,9 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4, unsigned long
                prom_send_capabilities();
 
        /*
-        * On pSeries and BPA, copy the CPU hold code
+        * On pSeries and Cell, copy the CPU hold code
         */
-               if (RELOC(of_platform) & (PLATFORM_PSERIES | PLATFORM_BPA))
+               if (RELOC(of_platform) & (PLATFORM_PSERIES | PLATFORM_CELL))
                        copy_and_flush(0, KERNELBASE - offset, 0x100, 0);
 
        /*