diff options
-rw-r--r-- | include/linux/sched.h | 9 |
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) | |||
2285 | * cond_resched_softirq() will enable bhs before scheduling. | 2285 | * cond_resched_softirq() will enable bhs before scheduling. |
2286 | */ | 2286 | */ |
2287 | extern int _cond_resched(void); | 2287 | extern int _cond_resched(void); |
2288 | #ifdef CONFIG_PREEMPT_BKL | 2288 | |
2289 | static inline int cond_resched(void) | ||
2290 | { | ||
2291 | return 0; | ||
2292 | } | ||
2293 | #else | ||
2294 | static inline int cond_resched(void) | 2289 | static inline int cond_resched(void) |
2295 | { | 2290 | { |
2296 | return _cond_resched(); | 2291 | return _cond_resched(); |
2297 | } | 2292 | } |
2298 | #endif | 2293 | |
2299 | extern int cond_resched_lock(spinlock_t * lock); | 2294 | extern int cond_resched_lock(spinlock_t * lock); |
2300 | extern int cond_resched_softirq(void); | 2295 | extern int cond_resched_softirq(void); |
2301 | static inline int cond_resched_bkl(void) | 2296 | static inline int cond_resched_bkl(void) |