aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel/rcutree.c4
-rw-r--r--kernel/rcutree_plugin.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/kernel/rcutree.c b/kernel/rcutree.c
index 26fc7807761d..d8024192c73b 100644
--- a/kernel/rcutree.c
+++ b/kernel/rcutree.c
@@ -100,7 +100,7 @@ void rcu_sched_qs(int cpu)
100 struct rcu_data *rdp; 100 struct rcu_data *rdp;
101 101
102 rdp = &per_cpu(rcu_sched_data, cpu); 102 rdp = &per_cpu(rcu_sched_data, cpu);
103 rdp->passed_quiesc_completed = rdp->completed; 103 rdp->passed_quiesc_completed = rdp->gpnum - 1;
104 barrier(); 104 barrier();
105 rdp->passed_quiesc = 1; 105 rdp->passed_quiesc = 1;
106 rcu_preempt_note_context_switch(cpu); 106 rcu_preempt_note_context_switch(cpu);
@@ -111,7 +111,7 @@ void rcu_bh_qs(int cpu)
111 struct rcu_data *rdp; 111 struct rcu_data *rdp;
112 112
113 rdp = &per_cpu(rcu_bh_data, cpu); 113 rdp = &per_cpu(rcu_bh_data, cpu);
114 rdp->passed_quiesc_completed = rdp->completed; 114 rdp->passed_quiesc_completed = rdp->gpnum - 1;
115 barrier(); 115 barrier();
116 rdp->passed_quiesc = 1; 116 rdp->passed_quiesc = 1;
117} 117}
diff --git a/kernel/rcutree_plugin.h b/kernel/rcutree_plugin.h
index c03edf766357..52075da70549 100644
--- a/kernel/rcutree_plugin.h
+++ b/kernel/rcutree_plugin.h
@@ -67,7 +67,7 @@ EXPORT_SYMBOL_GPL(rcu_batches_completed);
67static void rcu_preempt_qs(int cpu) 67static void rcu_preempt_qs(int cpu)
68{ 68{
69 struct rcu_data *rdp = &per_cpu(rcu_preempt_data, cpu); 69 struct rcu_data *rdp = &per_cpu(rcu_preempt_data, cpu);
70 rdp->passed_quiesc_completed = rdp->completed; 70 rdp->passed_quiesc_completed = rdp->gpnum - 1;
71 barrier(); 71 barrier();
72 rdp->passed_quiesc = 1; 72 rdp->passed_quiesc = 1;
73} 73}