2 files changed, 2 insertions, 1 deletions

diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index 2ffdc863bff3..e28a139c29d0 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -517,6 +517,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);
diff --git a/arch/ppc/kernel/idle.c b/arch/ppc/kernel/idle.c
index 3c4e4cb61074..821a75e45602 100644
--- a/arch/ppc/kernel/idle.c
+++ b/arch/ppc/kernel/idle.c
@@ -63,7 +63,7 @@ void cpu_idle(void)
         int cpu = smp_processor_id();
 
         for (;;) {
-                while (need_resched()) {
+                while (!need_resched()) {
                         if (ppc_md.idle != NULL)
                                 ppc_md.idle();
                         else