diff options
-rw-r--r-- | kernel/rcutree.c | 4 | ||||
-rw-r--r-- | kernel/rcutree.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kernel/rcutree.c b/kernel/rcutree.c index ec007dd22632..26fc7807761d 100644 --- a/kernel/rcutree.c +++ b/kernel/rcutree.c | |||
@@ -187,7 +187,7 @@ static struct rcu_node *rcu_get_root(struct rcu_state *rsp) | |||
187 | */ | 187 | */ |
188 | static void dyntick_record_completed(struct rcu_state *rsp, long comp) | 188 | static void dyntick_record_completed(struct rcu_state *rsp, long comp) |
189 | { | 189 | { |
190 | rsp->dynticks_completed = comp; | 190 | rsp->completed_fqs = comp; |
191 | } | 191 | } |
192 | 192 | ||
193 | #ifdef CONFIG_SMP | 193 | #ifdef CONFIG_SMP |
@@ -197,7 +197,7 @@ static void dyntick_record_completed(struct rcu_state *rsp, long comp) | |||
197 | */ | 197 | */ |
198 | static long dyntick_recall_completed(struct rcu_state *rsp) | 198 | static long dyntick_recall_completed(struct rcu_state *rsp) |
199 | { | 199 | { |
200 | return rsp->dynticks_completed; | 200 | return rsp->completed_fqs; |
201 | } | 201 | } |
202 | 202 | ||
203 | /* | 203 | /* |
diff --git a/kernel/rcutree.h b/kernel/rcutree.h index ddb79ece05eb..17a28a08b559 100644 --- a/kernel/rcutree.h +++ b/kernel/rcutree.h | |||
@@ -264,6 +264,8 @@ struct rcu_state { | |||
264 | long orphan_qlen; /* Number of orphaned cbs. */ | 264 | long orphan_qlen; /* Number of orphaned cbs. */ |
265 | spinlock_t fqslock; /* Only one task forcing */ | 265 | spinlock_t fqslock; /* Only one task forcing */ |
266 | /* quiescent states. */ | 266 | /* quiescent states. */ |
267 | long completed_fqs; /* Value of completed @ snap. */ | ||
268 | /* Protected by fqslock. */ | ||
267 | unsigned long jiffies_force_qs; /* Time at which to invoke */ | 269 | unsigned long jiffies_force_qs; /* Time at which to invoke */ |
268 | /* force_quiescent_state(). */ | 270 | /* force_quiescent_state(). */ |
269 | unsigned long n_force_qs; /* Number of calls to */ | 271 | unsigned long n_force_qs; /* Number of calls to */ |
@@ -278,8 +280,6 @@ struct rcu_state { | |||
278 | unsigned long jiffies_stall; /* Time at which to check */ | 280 | unsigned long jiffies_stall; /* Time at which to check */ |
279 | /* for CPU stalls. */ | 281 | /* for CPU stalls. */ |
280 | #endif /* #ifdef CONFIG_RCU_CPU_STALL_DETECTOR */ | 282 | #endif /* #ifdef CONFIG_RCU_CPU_STALL_DETECTOR */ |
281 | long dynticks_completed; /* Value of completed @ snap. */ | ||
282 | /* Protected by fqslock. */ | ||
283 | }; | 283 | }; |
284 | 284 | ||
285 | #ifdef RCU_TREE_NONCORE | 285 | #ifdef RCU_TREE_NONCORE |