diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-02-18 11:59:20 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-02-18 11:59:20 -0500 |
commit | 3b3336d4fed58ea5a019a8a1d00fa741be492716 (patch) | |
tree | ad4e3c01385ca6601f418809d926914a03cc4e1b /kernel | |
parent | e07e0d4cb0c4bfe822ec8491cc06269096a38bea (diff) | |
parent | c0135d07b013fa8f7ba9ec91b4369c372e6a28cb (diff) |
Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/urgent
Pull RCU fix from Paul E. McKenney.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/rcu/tree_plugin.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h index 2e850a51bb8f..bca28b00f7e6 100644 --- a/kernel/rcu/tree_plugin.h +++ b/kernel/rcu/tree_plugin.h | |||
@@ -327,6 +327,7 @@ void rcu_read_unlock_special(struct task_struct *t) | |||
327 | special = t->rcu_read_unlock_special; | 327 | special = t->rcu_read_unlock_special; |
328 | if (special.b.need_qs) { | 328 | if (special.b.need_qs) { |
329 | rcu_preempt_qs(); | 329 | rcu_preempt_qs(); |
330 | t->rcu_read_unlock_special.b.need_qs = false; | ||
330 | if (!t->rcu_read_unlock_special.s) { | 331 | if (!t->rcu_read_unlock_special.s) { |
331 | local_irq_restore(flags); | 332 | local_irq_restore(flags); |
332 | return; | 333 | return; |