| From 14db40696d6e731e82f96a6410abe55b1450d663 Mon Sep 17 00:00:00 2001 |
| From: Thomas Gleixner <tglx@linutronix.de> |
| Date: Sat, 25 Jul 2009 22:37:24 +0200 |
| Subject: [PATCH] x86: fix preempt_enable_no_resched usage |
| |
| commit f2905d541f2329af7ce09a2b95bfa307e5c05fb6 in tip. |
| |
| Triggers the missed preemption check. |
| |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| --- |
| arch/x86/kernel/process_32.c | 2 +- |
| arch/x86/kernel/process_64.c | 2 +- |
| 2 files changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c |
| index f6c6266..6c911d8 100644 |
| --- a/arch/x86/kernel/process_32.c |
| +++ b/arch/x86/kernel/process_32.c |
| @@ -114,7 +114,7 @@ void cpu_idle(void) |
| start_critical_timings(); |
| } |
| tick_nohz_restart_sched_tick(); |
| - preempt_enable_no_resched(); |
| + __preempt_enable_no_resched(); |
| schedule(); |
| preempt_disable(); |
| } |
| diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c |
| index 17cb329..bf82f58 100644 |
| --- a/arch/x86/kernel/process_64.c |
| +++ b/arch/x86/kernel/process_64.c |
| @@ -146,7 +146,7 @@ void cpu_idle(void) |
| } |
| |
| tick_nohz_restart_sched_tick(); |
| - preempt_enable_no_resched(); |
| + __preempt_enable_no_resched(); |
| schedule(); |
| preempt_disable(); |
| } |
| -- |
| 1.7.0.4 |
| |
