diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-03-21 13:32:17 +0100 |
|---|---|---|
| committer | Steven Rostedt <rostedt@rostedt.homelinux.com> | 2012-08-24 22:38:45 -0400 |
| commit | 3598f7a1f68e41b68dc0aac40dcd77bc08e6f44b (patch) | |
| tree | 1fd6f4799693e67965d9cde287b4545345376993 /arch | |
| parent | ed15bdb1f20fa4c7b8d881f6c0c9d990b736c7e5 (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.c | 2 | ||||
| -rw-r--r-- | arch/sparc/kernel/process_64.c | 2 |
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 |