---

yaml --- r: 158326 b: refs/heads/master c: 6f80bd9 h: refs/heads/master v: v3
git-mirror · Jul 18, 2009 · 08eece8 · 08eece8
1 parent 58a1d81
commit 08eece8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git 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
@@ -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)