2 files changed, 6 insertions, 12 deletions
diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c
index f793742eec2b..935fdbcd88c2 100644
--- a/arch/sparc/kernel/process_32.c
+++ b/arch/sparc/kernel/process_32.c
@@ -113,9 +113,7 @@ void cpu_idle(void)
                        while (!need_resched())
                                cpu_relax();
                }
-                preempt_enable_no_resched();
+                schedule_preempt_disabled();
-                schedule();
-                preempt_disable();
                check_pgt_cache();
        }
 }
@@ -138,9 +136,7 @@ void cpu_idle(void)
                        while (!need_resched())
                                cpu_relax();
                }
-                preempt_enable_no_resched();
+                schedule_preempt_disabled();
-                schedule();
-                preempt_disable();
                check_pgt_cache();
        }
 }
diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
index 39d8b05201a2..06b5b5fc20c7 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)) {
+                        sched_preempt_enable_no_resched();
                        cpu_play_dead();
+                }
 #endif
+                schedule_preempt_disabled();
-                schedule();
-                preempt_disable();
        }
 }

diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c index f793742eec2b..935fdbcd88c2 100644 --- a/arch/sparc/kernel/process_32.c +++ b/arch/sparc/kernel/process_32.c
@@ -113,9 +113,7 @@ void cpu_idle(void)
113	while (!need_resched())	113	while (!need_resched())
114	cpu_relax();	114	cpu_relax();
115	}	115	}
116	preempt_enable_no_resched();	116	schedule_preempt_disabled();
117	schedule();
118	preempt_disable();
119	check_pgt_cache();	117	check_pgt_cache();
120	}	118	}
121	}	119	}
@@ -138,9 +136,7 @@ void cpu_idle(void)
138	while (!need_resched())	136	while (!need_resched())
139	cpu_relax();	137	cpu_relax();
140	}	138	}
141	preempt_enable_no_resched();	139	schedule_preempt_disabled();
142	schedule();
143	preempt_disable();
144	check_pgt_cache();	140	check_pgt_cache();
145	}	141	}
146	}	142	}


diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c index 39d8b05201a2..06b5b5fc20c7 100644 --- a/arch/sparc/kernel/process_64.c +++ b/arch/sparc/kernel/process_64.c
@@ -104,15 +104,13 @@ void cpu_idle(void)
104	rcu_idle_exit();	104	rcu_idle_exit();
105	tick_nohz_idle_exit();	105	tick_nohz_idle_exit();
106		106
107	preempt_enable_no_resched();
108
109	#ifdef CONFIG_HOTPLUG_CPU	107	#ifdef CONFIG_HOTPLUG_CPU
110	if (cpu_is_offline(cpu))	108	if (cpu_is_offline(cpu)) {
		109	sched_preempt_enable_no_resched();
111	cpu_play_dead();	110	cpu_play_dead();
		111	}
112	#endif	112	#endif
113		113	schedule_preempt_disabled();
114	schedule();
115	preempt_disable();
116	}	114	}
117	}	115	}
118		116