Messages in this thread Patch in this message | | | From | Frederic Weisbecker <> | Subject | [PATCH 5/7] sched: Remove the CONFIG_PREEMPT_BKL case definition of cond_resched() | Date | Thu, 16 Jul 2009 02:28:12 -0400 |
| |
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> --- include/linux/sched.h | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/include/linux/sched.h b/include/linux/sched.h index 9bada20..e2bdf18 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -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) -- 1.6.2.3
| |