Re: [PATCH tip/core/rcu 03/15] rcu: Prevent excessive line length in RCU_STATE_INITIALIZER()

[Josh Triplett <josh@joshtriplett.org>]

On Fri, Jun 15, 2012 at 02:05:58PM -0700, Paul E. McKenney wrote:
> From: "Paul E. McKenney" <paul.mckenney@linaro.org>
> 
> Upcoming rcu_barrier() concurrency commits will result in line lengths
> greater than 80 characters in the RCU_STATE_INITIALIZER(), so this commit
> shortens the name of the macro's argument to prevent this.
> 
> Signed-off-by: Paul E. McKenney <paul.mckenney@linaro.org>
> Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>

Reviewed-by: Josh Triplett <josh@joshtriplett.org>

>  kernel/rcutree.c |   14 +++++++-------
>  1 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/kernel/rcutree.c b/kernel/rcutree.c
> index 9098910..8ce1b1d 100644
> --- a/kernel/rcutree.c
> +++ b/kernel/rcutree.c
> @@ -62,18 +62,18 @@
>  
>  static struct lock_class_key rcu_node_class[RCU_NUM_LVLS];
>  
> -#define RCU_STATE_INITIALIZER(structname) { \
> -	.level = { &structname##_state.node[0] }, \
> +#define RCU_STATE_INITIALIZER(sname) { \
> +	.level = { &sname##_state.node[0] }, \
>  	.fqs_state = RCU_GP_IDLE, \
>  	.gpnum = -300, \
>  	.completed = -300, \
> -	.onofflock = __RAW_SPIN_LOCK_UNLOCKED(&structname##_state.onofflock), \
> -	.orphan_nxttail = &structname##_state.orphan_nxtlist, \
> -	.orphan_donetail = &structname##_state.orphan_donelist, \
> -	.fqslock = __RAW_SPIN_LOCK_UNLOCKED(&structname##_state.fqslock), \
> +	.onofflock = __RAW_SPIN_LOCK_UNLOCKED(&sname##_state.onofflock), \
> +	.orphan_nxttail = &sname##_state.orphan_nxtlist, \
> +	.orphan_donetail = &sname##_state.orphan_donelist, \
> +	.fqslock = __RAW_SPIN_LOCK_UNLOCKED(&sname##_state.fqslock), \
>  	.n_force_qs = 0, \
>  	.n_force_qs_ngp = 0, \
> -	.name = #structname, \
> +	.name = #sname, \
>  }
>  
>  struct rcu_state rcu_sched_state = RCU_STATE_INITIALIZER(rcu_sched);
> -- 
> 1.7.8
>