From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
To: linux-kernel@vger.kernel.org
Cc: mingo@kernel.org, jiangshanlai@gmail.com, dipankar@in.ibm.com,
akpm@linux-foundation.org, mathieu.desnoyers@efficios.com,
josh@joshtriplett.org, tglx@linutronix.de, peterz@infradead.org,
rostedt@goodmis.org, dhowells@redhat.com, edumazet@google.com,
dvhart@linux.intel.com, fweisbec@gmail.com, oleg@redhat.com,
bobby.prani@gmail.com,
"Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Subject: [PATCH v2 tip/core/rcu 01/14] rcu: Move lock_class_key to local scope
Date: Wed, 9 Dec 2015 15:09:59 -0800 [thread overview]
Message-ID: <1449702612-1661-1-git-send-email-paulmck@linux.vnet.ibm.com> (raw)
In-Reply-To: <20151209230940.GA1251@linux.vnet.ibm.com>
Currently, the rcu_node_class[], rcu_fqs_class[], and rcu_exp_class[]
arrays needlessly pollute the global namespace within tree.c. This
commit therefore converts them to static local variables within
rcu_init_one().
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
---
kernel/rcu/tree.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
index 81aa1cdc6bc9..23df2661c899 100644
--- a/kernel/rcu/tree.c
+++ b/kernel/rcu/tree.c
@@ -68,10 +68,6 @@ MODULE_ALIAS("rcutree");
/* Data structures. */
-static struct lock_class_key rcu_node_class[RCU_NUM_LVLS];
-static struct lock_class_key rcu_fqs_class[RCU_NUM_LVLS];
-static struct lock_class_key rcu_exp_class[RCU_NUM_LVLS];
-
/*
* In order to export the rcu_state name to the tracing tools, it
* needs to be added in the __tracepoint_string section.
@@ -4365,6 +4361,9 @@ static void __init rcu_init_one(struct rcu_state *rsp,
static const char * const buf[] = RCU_NODE_NAME_INIT;
static const char * const fqs[] = RCU_FQS_NAME_INIT;
static const char * const exp[] = RCU_EXP_NAME_INIT;
+ static struct lock_class_key rcu_node_class[RCU_NUM_LVLS];
+ static struct lock_class_key rcu_fqs_class[RCU_NUM_LVLS];
+ static struct lock_class_key rcu_exp_class[RCU_NUM_LVLS];
static u8 fl_mask = 0x1;
int levelcnt[RCU_NUM_LVLS]; /* # nodes in each level. */
--
2.5.2
next prev parent reply other threads:[~2015-12-09 23:20 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-09 23:09 [PATCH v2 tip/core/rcu 0/14] Miscellaneous fixes for 4.5 Paul E. McKenney
2015-12-09 23:09 ` Paul E. McKenney [this message]
2015-12-09 23:10 ` [PATCH v2 tip/core/rcu 02/14] kernel: Make rcu/tree_trace.c explicitly non-modular Paul E. McKenney
2015-12-09 23:10 ` [PATCH v2 tip/core/rcu 03/14] rcu: Simplify rcu_sched_qs() control flow Paul E. McKenney
2015-12-09 23:10 ` [PATCH v2 tip/core/rcu 04/14] rcu: Remove lock-acquisition loop from rcu_read_unlock_special() Paul E. McKenney
2015-12-09 23:10 ` [PATCH v2 tip/core/rcu 05/14] rcu: Fix obsolete rcu_bootup_announce_oddness() comment Paul E. McKenney
2015-12-09 23:10 ` [PATCH v2 tip/core/rcu 06/14] rcu: Avoid tick_nohz_active checks on NOCBs CPUs Paul E. McKenney
2015-12-09 23:10 ` [PATCH v2 tip/core/rcu 07/14] rcu: Stop disabling interrupts in scheduler fastpaths Paul E. McKenney
2015-12-09 23:10 ` [PATCH v2 tip/core/rcu 08/14] rcu: Eliminate unused rcu_init_one() argument Paul E. McKenney
2015-12-09 23:10 ` [PATCH v2 tip/core/rcu 09/14] rcu: Make cpu_needs_another_gp() be bool Paul E. McKenney
2015-12-09 23:10 ` [PATCH v2 tip/core/rcu 10/14] rcu: Don't redundantly disable irqs in rcu_irq_{enter,exit}() Paul E. McKenney
2015-12-09 23:10 ` [PATCH v2 tip/core/rcu 11/14] rcu: Fix comment for rcu_dereference_raw_notrace Paul E. McKenney
2015-12-09 23:10 ` [PATCH v2 tip/core/rcu 12/14] rcu: Move wakeup out from under rnp->lock Paul E. McKenney
2015-12-09 23:10 ` [PATCH v2 tip/core/rcu 13/14] rcu: Make rcu_gp_init() be bool rather than int Paul E. McKenney
2015-12-09 23:10 ` [PATCH v2 tip/core/rcu 14/14] list: Add lockless list traversal primitives Paul E. McKenney
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1449702612-1661-1-git-send-email-paulmck@linux.vnet.ibm.com \
--to=paulmck@linux.vnet.ibm.com \
--cc=akpm@linux-foundation.org \
--cc=bobby.prani@gmail.com \
--cc=dhowells@redhat.com \
--cc=dipankar@in.ibm.com \
--cc=dvhart@linux.intel.com \
--cc=edumazet@google.com \
--cc=fweisbec@gmail.com \
--cc=jiangshanlai@gmail.com \
--cc=josh@joshtriplett.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mathieu.desnoyers@efficios.com \
--cc=mingo@kernel.org \
--cc=oleg@redhat.com \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®