X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=arch%2Fsparc%2Fkernel%2Fprocess_64.c;h=ab9a292682130375825b1e2eff14a81aca598db6;hb=bd2f55361f18347e890d52ff9cfd8895455ec11b;hp=39d8b05201a23bd83eb6866d05477f3b34664957;hpb=c5491ea779793f977d282754db478157cc409d82;p=deliverable%2Flinux.git

diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
index 39d8b05201a2..ab9a29268213 100644
--- a/arch/sparc/kernel/process_64.c
+++ b/arch/sparc/kernel/process_64.c
@@ -104,15 +104,13 @@ void cpu_idle(void)
 		rcu_idle_exit();
 		tick_nohz_idle_exit();
 
-		preempt_enable_no_resched();
-
 #ifdef CONFIG_HOTPLUG_CPU
-		if (cpu_is_offline(cpu))
+		if (cpu_is_offline(cpu)) {
+			preempt_enable_no_resched();
 			cpu_play_dead();
+		}
 #endif
-
-		schedule();
-		preempt_disable();
+		schedule_preempt_disabled();
 	}
 }