Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88a4976d authored by Paul E. McKenney's avatar Paul E. McKenney
Browse files

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: default avatarJosh Triplett <josh@joshtriplett.org>
Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
parent 6c8c1485

kernel/rcu/tree.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -2793,14 +2793,14 @@ static void rcu_adopt_orphan_cbs(struct rcu_state *rsp, unsigned long flags) 
 */

 */

static void rcu_cleanup_dying_cpu(struct rcu_state *rsp)

static void rcu_cleanup_dying_cpu(struct rcu_state *rsp)

{

{

	RCU_TRACE(unsigned long mask);

	RCU_TRACE(unsigned long mask;)

	RCU_TRACE(struct rcu_data *rdp = this_cpu_ptr(rsp->rda));

	RCU_TRACE(struct rcu_data *rdp = this_cpu_ptr(rsp->rda);)

	RCU_TRACE(struct rcu_node *rnp = rdp->mynode);

	RCU_TRACE(struct rcu_node *rnp = rdp->mynode;)





	if (!IS_ENABLED(CONFIG_HOTPLUG_CPU))

	if (!IS_ENABLED(CONFIG_HOTPLUG_CPU))

		return;

		return;





	RCU_TRACE(mask = rdp->grpmask);

	RCU_TRACE(mask = rdp->grpmask;)

	trace_rcu_grace_period(rsp->name,

	trace_rcu_grace_period(rsp->name,

			       rnp->gpnum + 1 - !!(rnp->qsmask & mask),

			       rnp->gpnum + 1 - !!(rnp->qsmask & mask),

			       TPS("cpuofl"));

			       TPS("cpuofl"));