diff options
| author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2017-01-23 15:04:46 -0500 | 
|---|---|---|
| committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2017-04-18 14:38:17 -0400 | 
| commit | 88a4976d0e37c0797ff3e6579a5f91cb7dced90d (patch) | |
| tree | 220507d827ee5ab102e46c9389b45c2c1a36fd4a /kernel/rcu/tree.c | |
| parent | 6c8c148542cf947cd95afb2c385310ce47111427 (diff) | |
rcu: Semicolon inside RCU_TRACE() for tree.c
The current use of "RCU_TRACE(statement);" can cause odd bugs, especially
where "statement" is a local-variable declaration, as it can leave a
misplaced ";" in the source code.  This commit therefore converts these
to "RCU_TRACE(statement;)", which avoids the misplaced ";".
Reported-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Diffstat (limited to 'kernel/rcu/tree.c')
| -rw-r--r-- | kernel/rcu/tree.c | 8 | 
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c index 0efad311ded4..3747277aae67 100644 --- a/kernel/rcu/tree.c +++ b/kernel/rcu/tree.c  | |||
| @@ -2793,14 +2793,14 @@ static void rcu_adopt_orphan_cbs(struct rcu_state *rsp, unsigned long flags) | |||
| 2793 | */ | 2793 | */ | 
| 2794 | static void rcu_cleanup_dying_cpu(struct rcu_state *rsp) | 2794 | static void rcu_cleanup_dying_cpu(struct rcu_state *rsp) | 
| 2795 | { | 2795 | { | 
| 2796 | RCU_TRACE(unsigned long mask); | 2796 | RCU_TRACE(unsigned long mask;) | 
| 2797 | RCU_TRACE(struct rcu_data *rdp = this_cpu_ptr(rsp->rda)); | 2797 | RCU_TRACE(struct rcu_data *rdp = this_cpu_ptr(rsp->rda);) | 
| 2798 | RCU_TRACE(struct rcu_node *rnp = rdp->mynode); | 2798 | RCU_TRACE(struct rcu_node *rnp = rdp->mynode;) | 
| 2799 | 2799 | ||
| 2800 | if (!IS_ENABLED(CONFIG_HOTPLUG_CPU)) | 2800 | if (!IS_ENABLED(CONFIG_HOTPLUG_CPU)) | 
| 2801 | return; | 2801 | return; | 
| 2802 | 2802 | ||
| 2803 | RCU_TRACE(mask = rdp->grpmask); | 2803 | RCU_TRACE(mask = rdp->grpmask;) | 
| 2804 | trace_rcu_grace_period(rsp->name, | 2804 | trace_rcu_grace_period(rsp->name, | 
| 2805 | rnp->gpnum + 1 - !!(rnp->qsmask & mask), | 2805 | rnp->gpnum + 1 - !!(rnp->qsmask & mask), | 
| 2806 | TPS("cpuofl")); | 2806 | TPS("cpuofl")); | 
