diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2011-03-21 12:33:18 +0100 |
---|---|---|
committer | Clark Williams <williams@redhat.com> | 2012-02-15 10:32:30 -0600 |
commit | ba6d1d8fa324f7ec0372abfd7d5114d7ec4ee1ea (patch) | |
tree | 14fbc4f5959d10ba8cb95e99150b6508a29f16d7 /arch/powerpc | |
parent | b880ce1fcff925e18a884c9c7acd1fcbdcf9d3ee (diff) |
sched: Use schedule_preempt_disabled()
Coccinelle based conversion.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/kernel/idle.c | 8 | ||||
-rw-r--r-- | arch/powerpc/platforms/iseries/setup.c | 8 |
2 files changed, 6 insertions, 10 deletions
diff --git a/arch/powerpc/kernel/idle.c b/arch/powerpc/kernel/idle.c index 39a2baa6ad58..f46dae5a56ef 100644 --- a/arch/powerpc/kernel/idle.c +++ b/arch/powerpc/kernel/idle.c @@ -94,11 +94,11 @@ void cpu_idle(void) HMT_medium(); ppc64_runlatch_on(); tick_nohz_restart_sched_tick(); - preempt_enable_no_resched(); - if (cpu_should_die()) + if (cpu_should_die()) { + preempt_enable_no_resched(); cpu_die(); - schedule(); - preempt_disable(); + } + schedule_preempt_disabled(); } } diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c index ea0acbd8966d..e0c5b4953c2f 100644 --- a/arch/powerpc/platforms/iseries/setup.c +++ b/arch/powerpc/platforms/iseries/setup.c @@ -582,9 +582,7 @@ static void iseries_shared_idle(void) if (hvlpevent_is_pending()) process_iSeries_events(); - preempt_enable_no_resched(); - schedule(); - preempt_disable(); + schedule_preempt_disabled(); } } @@ -611,9 +609,7 @@ static void iseries_dedicated_idle(void) ppc64_runlatch_on(); tick_nohz_restart_sched_tick(); - preempt_enable_no_resched(); - schedule(); - preempt_disable(); + schedule_preempt_disabled(); } } |