diff options
| author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2018-03-05 11:29:40 -0800 |
|---|---|---|
| committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2018-03-05 18:08:36 -0800 |
| commit | 08c5ee9132655d957daef41dc264b694dff817e3 (patch) | |
| tree | 9402c302dd3f7064a3b4ff1d5af079ea658729d6 /kernel | |
| parent | 4551cfd69a85393f478462fe5e16e42f0fa6391e (diff) | |
| download | linux-next-08c5ee9132655d957daef41dc264b694dff817e3.tar.gz | |
softirq: Eliminate unused cond_resched_softirq() macro
The cond_resched_softirq() macro is not used anywhere in mainline, so
this commit simplifies the kernel by eliminating it.
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched/core.c | 14 | ||||
| -rw-r--r-- | kernel/softirq.c | 3 |
2 files changed, 1 insertions, 16 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index bf724c1952ea..53fbb5432eb9 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -4953,20 +4953,6 @@ int __cond_resched_lock(spinlock_t *lock) } EXPORT_SYMBOL(__cond_resched_lock); -int __sched __cond_resched_softirq(void) -{ - BUG_ON(!in_softirq()); - - if (should_resched(SOFTIRQ_DISABLE_OFFSET)) { - local_bh_enable(); - preempt_schedule_common(); - local_bh_disable(); - return 1; - } - return 0; -} -EXPORT_SYMBOL(__cond_resched_softirq); - /** * yield - yield the current processor to other threads. * diff --git a/kernel/softirq.c b/kernel/softirq.c index 24d243ef8e71..c86420b4e3ce 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c @@ -145,8 +145,7 @@ static void __local_bh_enable(unsigned int cnt) } /* - * Special-case - softirqs can safely be enabled in - * cond_resched_softirq(), or by __do_softirq(), + * Special-case - softirqs can safely be enabled by __do_softirq(), * without processing still-pending softirqs: */ void _local_bh_enable(void) |