diff options
author | 2012-08-23 14:11:25 +0200 | |
---|---|---|
committer | 2012-09-23 07:44:42 -0700 | |
commit | 6a6c0272f17cc80a8286d915f2ddf31557c2d559 (patch) | |
tree | 3b4babe1cbfa3659d42d9ecf326f6169defe4730 /arch/alpha/kernel/process.c | |
parent | rcu: Fix day-one dyntick-idle stall-warning bug (diff) | |
download | linux-6a6c0272f17cc80a8286d915f2ddf31557c2d559.tar.gz linux-6a6c0272f17cc80a8286d915f2ddf31557c2d559.tar.bz2 linux-6a6c0272f17cc80a8286d915f2ddf31557c2d559.zip |
alpha: Fix preemption handling in idle loop
cpu_idle() is called on the boot CPU by the init code with
preemption disabled. But the cpu_idle() function in alpha
doesn't handle this when it calls schedule() directly.
Fix it by converting it into schedule_preempt_disabled().
Also disable preemption before calling cpu_idle() from
secondary CPU entry code to stay consistent with this
state.
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Tested-by: Michael Cree <mcree@orcon.net.nz>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Matt Turner <mattst88@gmail.com>
Cc: alpha <linux-alpha@vger.kernel.org>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Diffstat (limited to 'arch/alpha/kernel/process.c')
-rw-r--r-- | arch/alpha/kernel/process.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/alpha/kernel/process.c b/arch/alpha/kernel/process.c index d6fde98b74b3..db56f31dbf70 100644 --- a/arch/alpha/kernel/process.c +++ b/arch/alpha/kernel/process.c @@ -56,7 +56,8 @@ cpu_idle(void) while (!need_resched()) cpu_relax(); - schedule(); + + schedule_preempt_disabled(); } } |