From 08eece806f4a2615dc884272a2614a5c364588ad Mon Sep 17 00:00:00 2001
From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Thu, 16 Jul 2009 15:44:29 +0200
Subject: [PATCH] --- yaml --- r: 158326 b: refs/heads/master c:
 6f80bd985fe242c2e6a8b6209ed20b0495d3d63b h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 6af7b7163806..912cfad9c203 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e4aafea2d4bde8b44d6500c4ee7195bbfc51269e
+refs/heads/master: 6f80bd985fe242c2e6a8b6209ed20b0495d3d63b
diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h
index 9bada20e2b23..e2bdf18e05c4 100644
--- a/trunk/include/linux/sched.h
+++ b/trunk/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)