Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Peter Zijlstra <a.p.zijlstra@chello.nl>
Reported-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <1247725694-6082-5-git-send-email-fweisbec@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

authored by

Frederic Weisbecker and committed by
Ingo Molnar
6f80bd98 e4aafea2

+2 -7
+2 -7
include/linux/sched.h
··· 2285 2285 * cond_resched_softirq() will enable bhs before scheduling. 2286 2286 */ 2287 2287 extern int _cond_resched(void); 2288 - #ifdef CONFIG_PREEMPT_BKL 2289 - static inline int cond_resched(void) 2290 - { 2291 - return 0; 2292 - } 2293 - #else 2288 + 2294 2289 static inline int cond_resched(void) 2295 2290 { 2296 2291 return _cond_resched(); 2297 2292 } 2298 - #endif 2293 + 2299 2294 extern int cond_resched_lock(spinlock_t * lock); 2300 2295 extern int cond_resched_softirq(void); 2301 2296 static inline int cond_resched_bkl(void)