diff options
Diffstat (limited to 'kernel/sched/core.c')
-rw-r--r-- | kernel/sched/core.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index b7c32cb7bfeb..3fb7acee7326 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c | |||
@@ -2510,13 +2510,11 @@ void __sched schedule_preempt_disabled(void) | |||
2510 | */ | 2510 | */ |
2511 | asmlinkage void __sched notrace preempt_schedule(void) | 2511 | asmlinkage void __sched notrace preempt_schedule(void) |
2512 | { | 2512 | { |
2513 | struct thread_info *ti = current_thread_info(); | ||
2514 | |||
2515 | /* | 2513 | /* |
2516 | * If there is a non-zero preempt_count or interrupts are disabled, | 2514 | * If there is a non-zero preempt_count or interrupts are disabled, |
2517 | * we do not want to preempt the current task. Just return.. | 2515 | * we do not want to preempt the current task. Just return.. |
2518 | */ | 2516 | */ |
2519 | if (likely(ti->preempt_count || irqs_disabled())) | 2517 | if (likely(!preemptible())) |
2520 | return; | 2518 | return; |
2521 | 2519 | ||
2522 | do { | 2520 | do { |