From 766966f9d9f0641808b1413865610dc6b4f8ef2f Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 12 May 2008 13:34:13 -0700
Subject: [PATCH] --- yaml --- r: 96445 b: refs/heads/master c:
 c714a534d85576af21b06be605ca55cb2fb887ee h: refs/heads/master i:   96443:
 959ba8778013506e8b8cf7774890f17344a2c8cb v: v3

---
 [refs]                      | 2 +-
 trunk/include/linux/sched.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d9007d2519c0..06b1b6a5809e 100644
--- 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
index 5a63f2d72af6..5395a6176f4b 100644
--- 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;