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

Commit 25528213 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Linus Torvalds
Browse files

tags: Fix DEFINE_PER_CPU expansions 



$ make tags
  GEN     tags
ctags: Warning: drivers/acpi/processor_idle.c:64: null expansion of name pattern "\1"
ctags: Warning: drivers/xen/events/events_2l.c:41: null expansion of name pattern "\1"
ctags: Warning: kernel/locking/lockdep.c:151: null expansion of name pattern "\1"
ctags: Warning: kernel/rcu/rcutorture.c:133: null expansion of name pattern "\1"
ctags: Warning: kernel/rcu/rcutorture.c:135: null expansion of name pattern "\1"
ctags: Warning: kernel/workqueue.c:323: null expansion of name pattern "\1"
ctags: Warning: net/ipv4/syncookies.c:53: null expansion of name pattern "\1"
ctags: Warning: net/ipv6/syncookies.c:44: null expansion of name pattern "\1"
ctags: Warning: net/rds/page.c:45: null expansion of name pattern "\1"

Which are all the result of the DEFINE_PER_CPU pattern:

  scripts/tags.sh:200:	'/\<DEFINE_PER_CPU([^,]*, *\([[:alnum:]_]*\)/\1/v/'
  scripts/tags.sh:201:	'/\<DEFINE_PER_CPU_SHARED_ALIGNED([^,]*, *\([[:alnum:]_]*\)/\1/v/'

The below cures them. All except the workqueue one are within reasonable
distance of the 80 char limit. TJ do you have any preference on how to
fix the wq one, or shall we just not care its too long?

Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Acked-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e6fd1fb3

drivers/acpi/processor_idle.c

+2 −2
Original line number Diff line number Diff line
@@ -61,8 +61,8 @@ module_param(latency_factor, uint, 0644); 


static DEFINE_PER_CPU(struct cpuidle_device *, acpi_cpuidle_device);



static DEFINE_PER_CPU(struct acpi_processor_cx * [CPUIDLE_STATE_MAX],

								acpi_cstate);

static

DEFINE_PER_CPU(struct acpi_processor_cx * [CPUIDLE_STATE_MAX], acpi_cstate);



static int disabled_by_idle_boot_param(void)

{

drivers/xen/events/events_2l.c

+3 −2
Original line number Diff line number Diff line
@@ -38,8 +38,9 @@ 
/* Find the first set bit in a evtchn mask */

#define EVTCHN_FIRST_BIT(w) find_first_bit(BM(&(w)), BITS_PER_EVTCHN_WORD)



static DEFINE_PER_CPU(xen_ulong_t [EVTCHN_2L_NR_CHANNELS/BITS_PER_EVTCHN_WORD],

		      cpu_evtchn_mask);

#define EVTCHN_MASK_SIZE (EVTCHN_2L_NR_CHANNELS/BITS_PER_EVTCHN_WORD)



static DEFINE_PER_CPU(xen_ulong_t [EVTCHN_MASK_SIZE], cpu_evtchn_mask);



static unsigned evtchn_2l_max_channels(void)

{

kernel/locking/lockdep.c

+1 −2
Original line number Diff line number Diff line
@@ -148,8 +148,7 @@ static inline struct lock_class *hlock_class(struct held_lock *hlock) 
}



#ifdef CONFIG_LOCK_STAT

static DEFINE_PER_CPU(struct lock_class_stats[MAX_LOCKDEP_KEYS],

		      cpu_lock_stats);

static DEFINE_PER_CPU(struct lock_class_stats[MAX_LOCKDEP_KEYS], cpu_lock_stats);



static inline u64 lockstat_clock(void)

{

kernel/rcu/rcutorture.c

+2 −4
Original line number Diff line number Diff line
@@ -130,10 +130,8 @@ static struct rcu_torture __rcu *rcu_torture_current; 
static unsigned long rcu_torture_current_version;

static struct rcu_torture rcu_tortures[10 * RCU_TORTURE_PIPE_LEN];

static DEFINE_SPINLOCK(rcu_torture_lock);

static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1],

		      rcu_torture_count) = { 0 };

static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1],

		      rcu_torture_batch) = { 0 };

static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_count) = { 0 };

static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_batch) = { 0 };

static atomic_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];

static atomic_t n_rcu_torture_alloc;

static atomic_t n_rcu_torture_alloc_fail;

kernel/workqueue.c

+1 −2
Original line number Diff line number Diff line
@@ -320,8 +320,7 @@ static bool wq_debug_force_rr_cpu = false; 
module_param_named(debug_force_rr_cpu, wq_debug_force_rr_cpu, bool, 0644);



/* the per-cpu worker pools */

static DEFINE_PER_CPU_SHARED_ALIGNED(struct worker_pool [NR_STD_WORKER_POOLS],

				     cpu_worker_pools);

static DEFINE_PER_CPU_SHARED_ALIGNED(struct worker_pool [NR_STD_WORKER_POOLS], cpu_worker_pools);



static DEFINE_IDR(worker_pool_idr);	/* PR: idr of all pools */