lkml.org 
[lkml]   [2012]   [Feb]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH tip/core/rcu 23/47] rcu: Clean up straggling rcu_preempt_needs_cpu() name
    Date
    From: "Paul E. McKenney" <paul.mckenney@linaro.org>

    The recent updates to RCU_CPU_FAST_NO_HZ have an rcu_needs_cpu() that
    does more than just check for callbacks, so get the name for
    rcu_preempt_needs_cpu() consistent with that change, now calling it
    rcu_preempt_cpu_has_callbacks().

    Signed-off-by: Paul E. McKenney <paul.mckenney@linaro.org>
    Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
    ---
    kernel/rcutree.c | 2 +-
    kernel/rcutree.h | 2 +-
    kernel/rcutree_plugin.h | 8 ++++----
    3 files changed, 6 insertions(+), 6 deletions(-)

    diff --git a/kernel/rcutree.c b/kernel/rcutree.c
    index 49bb363..0569ba1 100644
    --- a/kernel/rcutree.c
    +++ b/kernel/rcutree.c
    @@ -1958,7 +1958,7 @@ static int rcu_cpu_has_callbacks(int cpu)
    /* RCU callbacks either ready or pending? */
    return per_cpu(rcu_sched_data, cpu).nxtlist ||
    per_cpu(rcu_bh_data, cpu).nxtlist ||
    - rcu_preempt_needs_cpu(cpu);
    + rcu_preempt_cpu_has_callbacks(cpu);
    }

    static DEFINE_PER_CPU(struct rcu_head, rcu_barrier_head) = {NULL};
    diff --git a/kernel/rcutree.h b/kernel/rcutree.h
    index 05e0367..58c9fc3 100644
    --- a/kernel/rcutree.h
    +++ b/kernel/rcutree.h
    @@ -449,7 +449,7 @@ static void rcu_report_exp_rnp(struct rcu_state *rsp, struct rcu_node *rnp,
    bool wake);
    #endif /* #if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_TREE_PREEMPT_RCU) */
    static int rcu_preempt_pending(int cpu);
    -static int rcu_preempt_needs_cpu(int cpu);
    +static int rcu_preempt_cpu_has_callbacks(int cpu);
    static void __cpuinit rcu_preempt_init_percpu_data(int cpu);
    static void rcu_preempt_cleanup_dying_cpu(void);
    static void __init __rcu_init_preempt(void);
    diff --git a/kernel/rcutree_plugin.h b/kernel/rcutree_plugin.h
    index 8041310..169517e 100644
    --- a/kernel/rcutree_plugin.h
    +++ b/kernel/rcutree_plugin.h
    @@ -887,9 +887,9 @@ static int rcu_preempt_pending(int cpu)
    }

    /*
    - * Does preemptible RCU need the CPU to stay out of dynticks mode?
    + * Does preemptible RCU have callbacks on this CPU?
    */
    -static int rcu_preempt_needs_cpu(int cpu)
    +static int rcu_preempt_cpu_has_callbacks(int cpu)
    {
    return !!per_cpu(rcu_preempt_data, cpu).nxtlist;
    }
    @@ -1128,9 +1128,9 @@ static int rcu_preempt_pending(int cpu)
    }

    /*
    - * Because preemptible RCU does not exist, it never needs any CPU.
    + * Because preemptible RCU does not exist, it never has callbacks
    */
    -static int rcu_preempt_needs_cpu(int cpu)
    +static int rcu_preempt_cpu_has_callbacks(int cpu)
    {
    return 0;
    }
    --
    1.7.8


    \
     
     \ /
      Last update: 2012-02-04 02:53    [W:0.026 / U:0.276 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site