diff options
author | Fabian Frederick <fabf@skynet.be> | 2014-05-06 13:21:14 -0400 |
---|---|---|
committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2014-07-09 12:14:34 -0400 |
commit | b4426b49c65e0d266f8a9181ca51d5bf11407714 (patch) | |
tree | 154afe9894d17ed08feac2ab18684c0d0ce344ff /kernel/rcu | |
parent | c41247e1d4864c863ee25e029dd53acdb2abc000 (diff) |
rcu: Make rcu node arrays static const char * const
Those two arrays are being passed to lockdep_init_map(), which expects
const char *, and are stored in lockdep_map the same way.
Cc: Dipankar Sarma <dipankar@in.ibm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Diffstat (limited to 'kernel/rcu')
-rw-r--r-- | kernel/rcu/tree.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c index 625d0b0cd75a..ebd99af2214e 100644 --- a/kernel/rcu/tree.c +++ b/kernel/rcu/tree.c | |||
@@ -3564,14 +3564,16 @@ static void __init rcu_init_levelspread(struct rcu_state *rsp) | |||
3564 | static void __init rcu_init_one(struct rcu_state *rsp, | 3564 | static void __init rcu_init_one(struct rcu_state *rsp, |
3565 | struct rcu_data __percpu *rda) | 3565 | struct rcu_data __percpu *rda) |
3566 | { | 3566 | { |
3567 | static char *buf[] = { "rcu_node_0", | 3567 | static const char * const buf[] = { |
3568 | "rcu_node_1", | 3568 | "rcu_node_0", |
3569 | "rcu_node_2", | 3569 | "rcu_node_1", |
3570 | "rcu_node_3" }; /* Match MAX_RCU_LVLS */ | 3570 | "rcu_node_2", |
3571 | static char *fqs[] = { "rcu_node_fqs_0", | 3571 | "rcu_node_3" }; /* Match MAX_RCU_LVLS */ |
3572 | "rcu_node_fqs_1", | 3572 | static const char * const fqs[] = { |
3573 | "rcu_node_fqs_2", | 3573 | "rcu_node_fqs_0", |
3574 | "rcu_node_fqs_3" }; /* Match MAX_RCU_LVLS */ | 3574 | "rcu_node_fqs_1", |
3575 | "rcu_node_fqs_2", | ||
3576 | "rcu_node_fqs_3" }; /* Match MAX_RCU_LVLS */ | ||
3575 | static u8 fl_mask = 0x1; | 3577 | static u8 fl_mask = 0x1; |
3576 | int cpustride = 1; | 3578 | int cpustride = 1; |
3577 | int i; | 3579 | int i; |