lkml.org 
[lkml]   [2014]   [Jul]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH tip/core/rcu 04/17] rcu: Make rcu node arrays static const char * const
    Date
    From: Fabian Frederick <fabf@skynet.be>

    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>
    ---
    kernel/rcu/tree.c | 18 ++++++++++--------
    1 file 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)
    static void __init rcu_init_one(struct rcu_state *rsp,
    struct rcu_data __percpu *rda)
    {
    - static char *buf[] = { "rcu_node_0",
    - "rcu_node_1",
    - "rcu_node_2",
    - "rcu_node_3" }; /* Match MAX_RCU_LVLS */
    - static char *fqs[] = { "rcu_node_fqs_0",
    - "rcu_node_fqs_1",
    - "rcu_node_fqs_2",
    - "rcu_node_fqs_3" }; /* Match MAX_RCU_LVLS */
    + static const char * const buf[] = {
    + "rcu_node_0",
    + "rcu_node_1",
    + "rcu_node_2",
    + "rcu_node_3" }; /* Match MAX_RCU_LVLS */
    + static const char * const fqs[] = {
    + "rcu_node_fqs_0",
    + "rcu_node_fqs_1",
    + "rcu_node_fqs_2",
    + "rcu_node_fqs_3" }; /* Match MAX_RCU_LVLS */
    static u8 fl_mask = 0x1;
    int cpustride = 1;
    int i;
    --
    1.8.1.5


    \
     
     \ /
      Last update: 2014-07-08 01:21    [W:4.002 / U:1.248 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site