2 files changed, 9 insertions, 10 deletions

diff --git a/arch/sh/kernel/process.c b/arch/sh/kernel/process.c
index 6dce9d0b81f8..fd4f240b833d 100644
--- a/arch/sh/kernel/process.c
+++ b/arch/sh/kernel/process.c
@@ -51,28 +51,24 @@ void enable_hlt(void)
 
 EXPORT_SYMBOL(enable_hlt);
 
-void default_idle(void)
+void cpu_idle(void)
 {
         /* endless idle loop with no priority at all */
         while (1) {
                 if (hlt_counter) {
-                        while (1)
-                                if (need_resched())
-                                        break;
+                        while (!need_resched())
+                                cpu_relax();
                 } else {
                         while (!need_resched())
                                 cpu_sleep();
                 }
 
+                preempt_enable_no_resched();
                 schedule();
+                preempt_disable();
         }
 }
 
-void cpu_idle(void)
-{
-        default_idle();
-}
-
 void machine_restart(char * __unused)
 {
         /* SR.BL=1 and invoke address error to let CPU reset (manual reset) */
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);