2 files changed, 5 insertions, 1 deletions

diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
index 4fe3d5715c41..dd725779d91f 100644
--- a/arch/mips/kernel/process.c
+++ b/arch/mips/kernel/process.c
@@ -52,7 +52,9 @@ ATTRIB_NORET void cpu_idle(void)
                 while (!need_resched())
                         if (cpu_wait)
                                 (*cpu_wait)();
+                preempt_enable_no_resched();
                 schedule();
+                preempt_disable();
         }
 }
 
diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c
index fcacf1aae98a..25472fcaf715 100644
--- a/arch/mips/kernel/smp.c
+++ b/arch/mips/kernel/smp.c
@@ -82,7 +82,7 @@ extern ATTRIB_NORET void cpu_idle(void);
  */
 asmlinkage void start_secondary(void)
 {
-        unsigned int cpu = smp_processor_id();
+        unsigned int cpu;
 
         cpu_probe();
         cpu_report();
@@ -95,6 +95,8 @@ asmlinkage void start_secondary(void)
          */
 
         calibrate_delay();
+        preempt_disable();
+        cpu = smp_processor_id();
         cpu_data[cpu].udelay_val = loops_per_jiffy;
 
         prom_smp_finish();