Commit 6f80bd98 authored Jul 16, 2009 by Frederic Weisbecker Committed by Ingo Molnar Jul 18, 2009

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>

parent e4aafea2

include/linux/sched.h

+2 −7

Original line number	Diff line number	Diff line
		@@ -2285,17 +2285,12 @@ static inline int need_resched(void)
		* cond_resched_softirq() will enable bhs before scheduling.
		*/
		extern int _cond_resched(void);
		#ifdef CONFIG_PREEMPT_BKL
		static inline int cond_resched(void)
		{
		return 0;
		}
		#else

		static inline int cond_resched(void)
		{
		return _cond_resched();
		}
		#endif

		extern int cond_resched_lock(spinlock_t * lock);
		extern int cond_resched_softirq(void);
		static inline int cond_resched_bkl(void)