diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/sched.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index c51b6565e07c..8841a915545d 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -5525,7 +5525,6 @@ static void __cond_resched(void) | |||
5525 | } while (need_resched()); | 5525 | } while (need_resched()); |
5526 | } | 5526 | } |
5527 | 5527 | ||
5528 | #if !defined(CONFIG_PREEMPT) || defined(CONFIG_PREEMPT_VOLUNTARY) | ||
5529 | int __sched _cond_resched(void) | 5528 | int __sched _cond_resched(void) |
5530 | { | 5529 | { |
5531 | if (need_resched() && !(preempt_count() & PREEMPT_ACTIVE) && | 5530 | if (need_resched() && !(preempt_count() & PREEMPT_ACTIVE) && |
@@ -5536,7 +5535,6 @@ int __sched _cond_resched(void) | |||
5536 | return 0; | 5535 | return 0; |
5537 | } | 5536 | } |
5538 | EXPORT_SYMBOL(_cond_resched); | 5537 | EXPORT_SYMBOL(_cond_resched); |
5539 | #endif | ||
5540 | 5538 | ||
5541 | /* | 5539 | /* |
5542 | * cond_resched_lock() - if a reschedule is pending, drop the given lock, | 5540 | * cond_resched_lock() - if a reschedule is pending, drop the given lock, |