diff options
author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2013-10-15 15:47:04 -0400 |
---|---|---|
committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2013-10-15 15:47:04 -0400 |
commit | 25e03a74e4a14e0d52a66fb56c728f049a6a26d3 (patch) | |
tree | 7302bd505a14a05e0ad1f9c595259a54e6bff66f /kernel/rcutiny.c | |
parent | 460aebac739df78b0e40a347934fdea377310577 (diff) | |
parent | 15f5191b6acbbb38029b06284e8fd20275e7cfe8 (diff) |
Merge branch 'gp.2013.09.25a' into HEAD
gp.2013.09.25a: Topic branch for grace-period updates.
Diffstat (limited to 'kernel/rcutiny.c')
-rw-r--r-- | kernel/rcutiny.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/rcutiny.c b/kernel/rcutiny.c index e99eb5fb10af..7e3b0d6fc6e2 100644 --- a/kernel/rcutiny.c +++ b/kernel/rcutiny.c | |||
@@ -275,7 +275,7 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp) | |||
275 | if (&rcp->rcucblist == rcp->donetail) { | 275 | if (&rcp->rcucblist == rcp->donetail) { |
276 | RCU_TRACE(trace_rcu_batch_start(rcp->name, 0, 0, -1)); | 276 | RCU_TRACE(trace_rcu_batch_start(rcp->name, 0, 0, -1)); |
277 | RCU_TRACE(trace_rcu_batch_end(rcp->name, 0, | 277 | RCU_TRACE(trace_rcu_batch_end(rcp->name, 0, |
278 | ACCESS_ONCE(rcp->rcucblist), | 278 | !!ACCESS_ONCE(rcp->rcucblist), |
279 | need_resched(), | 279 | need_resched(), |
280 | is_idle_task(current), | 280 | is_idle_task(current), |
281 | false)); | 281 | false)); |