aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorPeter Zijlstra <peterz@infradead.org>2016-03-15 17:52:49 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2016-03-15 19:55:16 -0400
commit25528213fe9f75f4e286f08d35a73ca2bb634a50 (patch)
tree0cdab3f91f941faf40729216878c72ea7857f0ff /kernel
parente6fd1fb3b5b58fcfa8e546c69d9cb64aa2c5c9b8 (diff)
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: Peter Zijlstra (Intel) <peterz@infradead.org> Acked-by: David S. Miller <davem@davemloft.net> Acked-by: Rafael 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: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/locking/lockdep.c3
-rw-r--r--kernel/rcu/rcutorture.c6
-rw-r--r--kernel/workqueue.c3
3 files changed, 4 insertions, 8 deletions
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index f894a2cd9b2a..53ab2f85d77e 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -148,8 +148,7 @@ static inline struct lock_class *hlock_class(struct held_lock *hlock)
148} 148}
149 149
150#ifdef CONFIG_LOCK_STAT 150#ifdef CONFIG_LOCK_STAT
151static DEFINE_PER_CPU(struct lock_class_stats[MAX_LOCKDEP_KEYS], 151static DEFINE_PER_CPU(struct lock_class_stats[MAX_LOCKDEP_KEYS], cpu_lock_stats);
152 cpu_lock_stats);
153 152
154static inline u64 lockstat_clock(void) 153static inline u64 lockstat_clock(void)
155{ 154{
diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
index d2988d047d66..4d5cc6aa7e1e 100644
--- a/kernel/rcu/rcutorture.c
+++ b/kernel/rcu/rcutorture.c
@@ -130,10 +130,8 @@ static struct rcu_torture __rcu *rcu_torture_current;
130static unsigned long rcu_torture_current_version; 130static unsigned long rcu_torture_current_version;
131static struct rcu_torture rcu_tortures[10 * RCU_TORTURE_PIPE_LEN]; 131static struct rcu_torture rcu_tortures[10 * RCU_TORTURE_PIPE_LEN];
132static DEFINE_SPINLOCK(rcu_torture_lock); 132static DEFINE_SPINLOCK(rcu_torture_lock);
133static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], 133static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_count) = { 0 };
134 rcu_torture_count) = { 0 }; 134static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_batch) = { 0 };
135static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1],
136 rcu_torture_batch) = { 0 };
137static atomic_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1]; 135static atomic_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
138static atomic_t n_rcu_torture_alloc; 136static atomic_t n_rcu_torture_alloc;
139static atomic_t n_rcu_torture_alloc_fail; 137static atomic_t n_rcu_torture_alloc_fail;
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 7ff5dc7d2ac5..16e13d8628a3 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -320,8 +320,7 @@ static bool wq_debug_force_rr_cpu = false;
320module_param_named(debug_force_rr_cpu, wq_debug_force_rr_cpu, bool, 0644); 320module_param_named(debug_force_rr_cpu, wq_debug_force_rr_cpu, bool, 0644);
321 321
322/* the per-cpu worker pools */ 322/* the per-cpu worker pools */
323static DEFINE_PER_CPU_SHARED_ALIGNED(struct worker_pool [NR_STD_WORKER_POOLS], 323static DEFINE_PER_CPU_SHARED_ALIGNED(struct worker_pool [NR_STD_WORKER_POOLS], cpu_worker_pools);
324 cpu_worker_pools);
325 324
326static DEFINE_IDR(worker_pool_idr); /* PR: idr of all pools */ 325static DEFINE_IDR(worker_pool_idr); /* PR: idr of all pools */
327 326