Merge branch 'fixes-2.6.23' of git://git.kernel.org/pub/scm/linux/kernel/git/galak...

[linux-2.6-omap-h63xx.git] / arch / powerpc / platforms / 86xx / mpc86xx_smp.c

diff --git a/arch/powerpc/platforms/86xx/mpc86xx_smp.c b/arch/powerpc/platforms/86xx/mpc86xx_smp.c
index bb7fb41933ad8abe557ae857ceaaf5b8d3f22d53..ba55b0ff0f746a4c60dd848c06bfb41faa97d026 100644 (file)
--- a/arch/powerpc/platforms/86xx/mpc86xx_smp.c
+++ b/arch/powerpc/platforms/86xx/mpc86xx_smp.c
@@ -15,8 +15,8 @@
 #include <linux/init.h>
 #include <linux/delay.h>
 
-#include <asm/pgtable.h>
 #include <asm/page.h>
+#include <asm/pgtable.h>
 #include <asm/pci-bridge.h>
 #include <asm-powerpc/mpic.h>
 #include <asm/mpc86xx.h>
@@ -65,7 +65,6 @@ smp_86xx_kick_cpu(int nr)
        pr_debug("smp_86xx_kick_cpu: kick CPU #%d\n", nr);
 
        local_irq_save(flags);
-       local_irq_disable();
 
        /* Save reset vector */
        save_vector = *vector;