aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2015-02-18 17:59:20 +0100
committerIngo Molnar <mingo@kernel.org>2015-02-18 17:59:20 +0100
commit3b3336d4fed58ea5a019a8a1d00fa741be492716 (patch)
treead4e3c01385ca6601f418809d926914a03cc4e1b /kernel
parentMerge branch 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff)
parentrcu: Clear need_qs flag to prevent splat (diff)
downloadlinux-dev-3b3336d4fed58ea5a019a8a1d00fa741be492716.tar.xz
linux-dev-3b3336d4fed58ea5a019a8a1d00fa741be492716.zip
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.h1
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)
special = t->rcu_read_unlock_special;
if (special.b.need_qs) {
rcu_preempt_qs();
+ t->rcu_read_unlock_special.b.need_qs = false;
if (!t->rcu_read_unlock_special.s) {
local_irq_restore(flags);
return;