summaryrefslogtreecommitdiffstats
path: root/include/linux/sched.h
diff options
context:
space:
mode:
authorFrederic Weisbecker2009-07-16 15:44:29 +0200
committerIngo Molnar2009-07-18 15:51:43 +0200
commit6f80bd985fe242c2e6a8b6209ed20b0495d3d63b (patch)
treecd21eeb013fe87a59c3406126e8357e30a22635a /include/linux/sched.h
parentsched: Add a preempt count base offset to __might_sleep() (diff)
downloadkernel-qcow2-linux-6f80bd985fe242c2e6a8b6209ed20b0495d3d63b.tar.gz
kernel-qcow2-linux-6f80bd985fe242c2e6a8b6209ed20b0495d3d63b.tar.xz
kernel-qcow2-linux-6f80bd985fe242c2e6a8b6209ed20b0495d3d63b.zip
sched: Remove the CONFIG_PREEMPT_BKL case definition of cond_resched()
CONFIG_PREEMPT_BKL doesn't exist anymore. So remove this config-on case definition of cond_resched(). Reported-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Reported-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> LKML-Reference: <1247725694-6082-5-git-send-email-fweisbec@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/sched.h')
-rw-r--r--include/linux/sched.h9
1 files changed, 2 insertions, 7 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 9bada20e2b23..e2bdf18e05c4 100644
--- a/include/linux/sched.h
+++ b/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)