diff options
author | Ingo Molnar <mingo@kernel.org> | 2014-09-23 01:21:42 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-09-23 01:21:42 -0400 |
commit | 62731433591156ece255e23ffd69ea4544b424f1 (patch) | |
tree | 125ce584cdb3166456b1767d03c3d5e72ea79a6e /kernel/softirq.c | |
parent | 7c9a3730a5ef4c6240eaaa2d8dcdb8cc1627d715 (diff) | |
parent | dd56af42bd829c6e770ed69812bd65a04eaeb1e4 (diff) |
Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu
Pull the v3.18 RCU changes from Paul E. McKenney:
"
* Update RCU documentation. These were posted to LKML at
https://lkml.org/lkml/2014/8/28/378.
* Miscellaneous fixes. These were posted to LKML at
https://lkml.org/lkml/2014/8/28/386. An additional fix that
eliminates a documented (but now inconvenient) deadlock between
RCU hotplug and expedited grace periods was posted at
https://lkml.org/lkml/2014/8/28/573.
* Changes related to No-CBs CPUs and NO_HZ_FULL. These were posted
to LKML at https://lkml.org/lkml/2014/8/28/412.
* Torture-test updates. These were posted to LKML at
https://lkml.org/lkml/2014/8/28/546 and at
https://lkml.org/lkml/2014/9/11/1114.
* RCU-tasks implementation. These were posted to LKML at
https://lkml.org/lkml/2014/8/28/540.
"
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/softirq.c')
-rw-r--r-- | kernel/softirq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/softirq.c b/kernel/softirq.c index 5918d227730f..348ec763b104 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c | |||
@@ -278,7 +278,7 @@ restart: | |||
278 | pending >>= softirq_bit; | 278 | pending >>= softirq_bit; |
279 | } | 279 | } |
280 | 280 | ||
281 | rcu_bh_qs(smp_processor_id()); | 281 | rcu_bh_qs(); |
282 | local_irq_disable(); | 282 | local_irq_disable(); |
283 | 283 | ||
284 | pending = local_softirq_pending(); | 284 | pending = local_softirq_pending(); |