---

yaml --- r: 96445 b: refs/heads/master c: c714a53 h: refs/heads/master i: 96443: 959ba87 v: v3
git-mirror · May 12, 2008 · 766966f · 766966f
1 parent 1ab55c6
commit 766966f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 542dafadd81eb5826280f7714592930144ae3e1f
+refs/heads/master: c714a534d85576af21b06be605ca55cb2fb887ee
diff --git a/trunk/include/linux/sched.h b/trunk/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;