diff options
| author | Greg Kroah-Hartman | 2014-07-21 19:07:25 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2014-07-21 19:07:25 +0200 |
| commit | 90125edbc49ec58b9101c4271bb1d87b04a4620f (patch) | |
| tree | 068353d4234435b17ade687b50a5d5015bdf1ad9 /kernel/sched/core.c | |
| parent | test: add firmware_class loader test (diff) | |
| parent | Linux 3.16-rc6 (diff) | |
| download | kernel-qcow2-linux-90125edbc49ec58b9101c4271bb1d87b04a4620f.tar.gz kernel-qcow2-linux-90125edbc49ec58b9101c4271bb1d87b04a4620f.tar.xz kernel-qcow2-linux-90125edbc49ec58b9101c4271bb1d87b04a4620f.zip | |
Merge 3.16-rc6 into driver-core-next
We want the platform changes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/sched/core.c')
| -rw-r--r-- | kernel/sched/core.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 3bdf01b494fe..bc1638b33449 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -4147,7 +4147,6 @@ static void __cond_resched(void) int __sched _cond_resched(void) { - rcu_cond_resched(); if (should_resched()) { __cond_resched(); return 1; @@ -4166,18 +4165,15 @@ EXPORT_SYMBOL(_cond_resched); */ int __cond_resched_lock(spinlock_t *lock) { - bool need_rcu_resched = rcu_should_resched(); int resched = should_resched(); int ret = 0; lockdep_assert_held(lock); - if (spin_needbreak(lock) || resched || need_rcu_resched) { + if (spin_needbreak(lock) || resched) { spin_unlock(lock); if (resched) __cond_resched(); - else if (unlikely(need_rcu_resched)) - rcu_resched(); else cpu_relax(); ret = 1; @@ -4191,7 +4187,6 @@ int __sched __cond_resched_softirq(void) { BUG_ON(!in_softirq()); - rcu_cond_resched(); /* BH disabled OK, just recording QSes. */ if (should_resched()) { local_bh_enable(); __cond_resched(); |