1 files changed, 1 insertions, 1 deletions

diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index 1794a694a928..36d67a8d7cbb 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -40,7 +40,6 @@
 #include <asm/prom.h>
 #include <asm/smp.h>
 #include <asm/time.h>
-#include <asm/xmon.h>
 #include <asm/machdep.h>
 #include <asm/cputable.h>
 #include <asm/system.h>
@@ -511,6 +510,7 @@ int __devinit start_secondary(void *unused)
 
         smp_store_cpu_info(cpu);
         set_dec(tb_ticks_per_jiffy);
+        preempt_disable();
         cpu_callin_map[cpu] = 1;
 
         smp_ops->setup_cpu(cpu);