Make 'cond_resched()' nullification depend on PREEMPT_BKL

torvalds · torvalds · commit c714a534d855 · 2008-05-12T13:34:13.000-07:00
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 &lt;torvalds@linux-foundation.org&gt;
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -2038,7 +2038,7 @@ static inline int need_resched(void)`
`2038`	`2038`	`* cond_resched_softirq() will enable bhs before scheduling.`
`2039`	`2039`	`*/`
`2040`	`2040`	`extern int _cond_resched(void);`
`2041`		`-#ifdef CONFIG_PREEMPT`
	`2041`	`+#ifdef CONFIG_PREEMPT_BKL`
`2042`	`2042`	`static inline int cond_resched(void)`
`2043`	`2043`	`{`
`2044`	`2044`	`return 0;`