summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-03-21 13:32:17 +0100
committerClark Williams <williams@redhat.com>2012-02-15 10:32:32 -0600
commit31a092f0d40328fc2bfbb2d0b4e72a52d16cbf96 (patch)
tree230d1be16d38b7dd1f5bfd83bd2c51e939ee3000 /arch
parent57c8ea9f160d1d44fb761c3a2301a812856832f0 (diff)
preempt-mark-legitimated-no-resched-sites.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/kernel/idle.c2
-rw-r--r--arch/sparc/kernel/process_64.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/idle.c b/arch/powerpc/kernel/idle.c
index f46dae5a56ef..5d70d1046e11 100644
--- a/arch/powerpc/kernel/idle.c
+++ b/arch/powerpc/kernel/idle.c
@@ -95,7 +95,7 @@ void cpu_idle(void)
ppc64_runlatch_on();
tick_nohz_restart_sched_tick();
if (cpu_should_die()) {
- preempt_enable_no_resched();
+ __preempt_enable_no_resched();
cpu_die();
}
schedule_preempt_disabled();
diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
index 8ba0dbe63bdc..86fe09afc89a 100644
--- a/arch/sparc/kernel/process_64.c
+++ b/arch/sparc/kernel/process_64.c
@@ -104,7 +104,7 @@ void cpu_idle(void)
#ifdef CONFIG_HOTPLUG_CPU
if (cpu_is_offline(cpu)) {
- preempt_enable_no_resched();
+ __preempt_enable_no_resched();
cpu_play_dead();
}
#endif