diff options
-rw-r--r-- | kernel/rcutree.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/rcutree.c b/kernel/rcutree.c index 24bbf2ce0605..9b36d6d7fb97 100644 --- a/kernel/rcutree.c +++ b/kernel/rcutree.c | |||
@@ -1403,6 +1403,8 @@ EXPORT_SYMBOL_GPL(call_rcu_bh); | |||
1403 | */ | 1403 | */ |
1404 | static int __rcu_pending(struct rcu_state *rsp, struct rcu_data *rdp) | 1404 | static int __rcu_pending(struct rcu_state *rsp, struct rcu_data *rdp) |
1405 | { | 1405 | { |
1406 | struct rcu_node *rnp = rdp->mynode; | ||
1407 | |||
1406 | rdp->n_rcu_pending++; | 1408 | rdp->n_rcu_pending++; |
1407 | 1409 | ||
1408 | /* Check for CPU stalls, if enabled. */ | 1410 | /* Check for CPU stalls, if enabled. */ |
@@ -1427,13 +1429,13 @@ static int __rcu_pending(struct rcu_state *rsp, struct rcu_data *rdp) | |||
1427 | } | 1429 | } |
1428 | 1430 | ||
1429 | /* Has another RCU grace period completed? */ | 1431 | /* Has another RCU grace period completed? */ |
1430 | if (ACCESS_ONCE(rsp->completed) != rdp->completed) { /* outside lock */ | 1432 | if (ACCESS_ONCE(rnp->completed) != rdp->completed) { /* outside lock */ |
1431 | rdp->n_rp_gp_completed++; | 1433 | rdp->n_rp_gp_completed++; |
1432 | return 1; | 1434 | return 1; |
1433 | } | 1435 | } |
1434 | 1436 | ||
1435 | /* Has a new RCU grace period started? */ | 1437 | /* Has a new RCU grace period started? */ |
1436 | if (ACCESS_ONCE(rsp->gpnum) != rdp->gpnum) { /* outside lock */ | 1438 | if (ACCESS_ONCE(rnp->gpnum) != rdp->gpnum) { /* outside lock */ |
1437 | rdp->n_rp_gp_started++; | 1439 | rdp->n_rp_gp_started++; |
1438 | return 1; | 1440 | return 1; |
1439 | } | 1441 | } |