2 files changed, 6 insertions, 1 deletions

diff --git a/arch/sh/kernel/process.c b/arch/sh/kernel/process.c
index 6dce9d0b81f8..1cbc26b796ad 100644
--- a/arch/sh/kernel/process.c
+++ b/arch/sh/kernel/process.c
@@ -64,7 +64,9 @@ void default_idle(void)
                                 cpu_sleep();
                 }
 
+                preempt_enable_no_resched();
                 schedule();
+                preempt_disable();
         }
 }
 
diff --git a/arch/sh/kernel/smp.c b/arch/sh/kernel/smp.c
index 5ecefc02896a..59e49b18252c 100644
--- a/arch/sh/kernel/smp.c
+++ b/arch/sh/kernel/smp.c
@@ -112,7 +112,9 @@ int __cpu_up(unsigned int cpu)
 
 int start_secondary(void *unused)
 {
-        unsigned int cpu = smp_processor_id();
+        unsigned int cpu;
+
+        cpu = smp_processor_id();
 
         atomic_inc(&init_mm.mm_count);
         current->active_mm = &init_mm;
@@ -120,6 +122,7 @@ int start_secondary(void *unused)
         smp_store_cpu_info(cpu);
 
         __smp_slave_init(cpu);
+        preempt_disable();
         per_cpu_trap_init();
         
         atomic_inc(&cpus_booted);