diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-05-10 14:08:16 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-05-10 14:08:16 +1000 |
| commit | ef804ba0c4b70dbd0976fbae7adb0939f4962b46 (patch) | |
| tree | e3fa714b51fcdb7ec6a8ff4502762dee38923113 /kernel/sched | |
| parent | b4ee1992edf8c54fc048b78cedc1cfdc3c353a86 (diff) | |
| parent | b92e1e16d7cabd4fb28ca14e7971e75be2a0536e (diff) | |
| download | linux-next-ef804ba0c4b70dbd0976fbae7adb0939f4962b46.tar.gz | |
Merge remote-tracking branch 'rcu/rcu/next'
Diffstat (limited to 'kernel/sched')
| -rw-r--r-- | kernel/sched/core.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 4e0ebae045dc..659f874bb07d 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -5011,20 +5011,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. * |