From: Linus Torvalds Date: Mon, 12 May 2008 20:34:13 +0000 (-0700) Subject: Make 'cond_resched()' nullification depend on PREEMPT_BKL X-Git-Tag: v2.6.26-rc3~127 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c714a534d85576af21b06be605ca55cb2fb887ee;p=linux-2.6-omap-h63xx.git Make 'cond_resched()' nullification depend on PREEMPT_BKL Because it's not correct with a non-preemptable BKL and just causes PREEMPT kernels to have longer latencies than non-PREEMPT ones (which is obviously not the point of it at all). Of course, that config option actually got removed as an option earlier, so for now this basically disables it entirely, but if BKL preemption is ever resurrected it will be a meaningful optimization. And in the meantime, it at least documents the intent of the code, while not doing the wrong thing. Signed-off-by: Linus Torvalds --- diff --git a/include/linux/sched.h b/include/linux/sched.h index 5a63f2d72af..5395a6176f4 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -2038,7 +2038,7 @@ static inline int need_resched(void) * cond_resched_softirq() will enable bhs before scheduling. */ extern int _cond_resched(void); -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPT_BKL static inline int cond_resched(void) { return 0;