Commit 6f80bd98 authored by Frederic Weisbecker's avatar Frederic Weisbecker Committed by Ingo Molnar

sched: Remove the CONFIG_PREEMPT_BKL case definition of cond_resched()

CONFIG_PREEMPT_BKL doesn't exist anymore. So remove this
config-on case definition of cond_resched().
Reported-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Reported-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <1247725694-6082-5-git-send-email-fweisbec@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent e4aafea2
...@@ -2285,17 +2285,12 @@ static inline int need_resched(void) ...@@ -2285,17 +2285,12 @@ static inline int need_resched(void)
* cond_resched_softirq() will enable bhs before scheduling. * cond_resched_softirq() will enable bhs before scheduling.
*/ */
extern int _cond_resched(void); extern int _cond_resched(void);
#ifdef CONFIG_PREEMPT_BKL
static inline int cond_resched(void)
{
return 0;
}
#else
static inline int cond_resched(void) static inline int cond_resched(void)
{ {
return _cond_resched(); return _cond_resched();
} }
#endif
extern int cond_resched_lock(spinlock_t * lock); extern int cond_resched_lock(spinlock_t * lock);
extern int cond_resched_softirq(void); extern int cond_resched_softirq(void);
static inline int cond_resched_bkl(void) static inline int cond_resched_bkl(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment