Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[muen/linux.git] / include / linux / sched.h

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 28ff3ca9f752d4add694dbd9e51e47769e473a10..14e4f9c123371e70eb75ce1b3ba1dbfe5ff2c6f8 100644 (file)
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1662,7 +1662,6 @@ static inline int test_tsk_need_resched(struct task_struct *tsk)
  * explicit rescheduling in places that are safe. The return
  * value indicates whether a reschedule was done in fact.
  * cond_resched_lock() will drop the spinlock before scheduling,
- * cond_resched_softirq() will enable bhs before scheduling.
  */
 #ifndef CONFIG_PREEMPT
 extern int _cond_resched(void);
@@ -1682,13 +1681,6 @@ extern int __cond_resched_lock(spinlock_t *lock);
        __cond_resched_lock(lock);                              \
 })
 
-extern int __cond_resched_softirq(void);
-
-#define cond_resched_softirq() ({                                      \
-       ___might_sleep(__FILE__, __LINE__, SOFTIRQ_DISABLE_OFFSET);     \
-       __cond_resched_softirq();                                       \
-})
-
 static inline void cond_resched_rcu(void)
 {
 #if defined(CONFIG_DEBUG_ATOMIC_SLEEP) || !defined(CONFIG_PREEMPT_RCU)