lkml.org 
[lkml]   [2018]   [Aug]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH tip/core/rcu 37/52] rcu: Remove rsp parameter from print_cpu_stall_info()
    Date
    There now is only one rcu_state structure in a given build of the
    Linux kernel, so there is no need to pass it as a parameter to RCU's
    functions. This commit therefore removes the rsp parameter from
    print_cpu_stall_info().

    Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
    ---
    kernel/rcu/tree.c | 4 ++--
    kernel/rcu/tree.h | 2 +-
    kernel/rcu/tree_plugin.h | 6 +++---
    3 files changed, 6 insertions(+), 6 deletions(-)

    diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
    index aa81958edec8..1b63a28f148d 100644
    --- a/kernel/rcu/tree.c
    +++ b/kernel/rcu/tree.c
    @@ -1341,7 +1341,7 @@ static void print_other_cpu_stall(unsigned long gp_seq)
    if (rnp->qsmask != 0) {
    for_each_leaf_node_possible_cpu(rnp, cpu)
    if (rnp->qsmask & leaf_node_cpu_bit(rnp, cpu)) {
    - print_cpu_stall_info(rsp, cpu);
    + print_cpu_stall_info(cpu);
    ndetected++;
    }
    }
    @@ -1408,7 +1408,7 @@ static void print_cpu_stall(void)
    pr_err("INFO: %s self-detected stall on CPU", rsp->name);
    print_cpu_stall_info_begin();
    raw_spin_lock_irqsave_rcu_node(rdp->mynode, flags);
    - print_cpu_stall_info(rsp, smp_processor_id());
    + print_cpu_stall_info(smp_processor_id());
    raw_spin_unlock_irqrestore_rcu_node(rdp->mynode, flags);
    print_cpu_stall_info_end();
    for_each_possible_cpu(cpu)
    diff --git a/kernel/rcu/tree.h b/kernel/rcu/tree.h
    index dc1c337f6da9..2bf57de9f78a 100644
    --- a/kernel/rcu/tree.h
    +++ b/kernel/rcu/tree.h
    @@ -472,7 +472,7 @@ static bool rcu_preempt_has_tasks(struct rcu_node *rnp);
    static bool rcu_preempt_need_deferred_qs(struct task_struct *t);
    static void rcu_preempt_deferred_qs(struct task_struct *t);
    static void print_cpu_stall_info_begin(void);
    -static void print_cpu_stall_info(struct rcu_state *rsp, int cpu);
    +static void print_cpu_stall_info(int cpu);
    static void print_cpu_stall_info_end(void);
    static void zero_cpu_stall_ticks(struct rcu_data *rdp);
    static void increment_cpu_stall_ticks(void);
    diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h
    index 9a6dea5fab86..08ff162e02b3 100644
    --- a/kernel/rcu/tree_plugin.h
    +++ b/kernel/rcu/tree_plugin.h
    @@ -1771,7 +1771,7 @@ static void print_cpu_stall_info_begin(void)
    *
    * Also print out idle and (if CONFIG_RCU_FAST_NO_HZ) idle-entry info.
    */
    -static void print_cpu_stall_info(struct rcu_state *rsp, int cpu)
    +static void print_cpu_stall_info(int cpu)
    {
    unsigned long delta;
    char fast_no_hz[72];
    @@ -1786,7 +1786,7 @@ static void print_cpu_stall_info(struct rcu_state *rsp, int cpu)
    */
    touch_nmi_watchdog();

    - ticks_value = rcu_seq_ctr(rsp->gp_seq - rdp->gp_seq);
    + ticks_value = rcu_seq_ctr(rcu_state.gp_seq - rdp->gp_seq);
    if (ticks_value) {
    ticks_title = "GPs behind";
    } else {
    @@ -1807,7 +1807,7 @@ static void print_cpu_stall_info(struct rcu_state *rsp, int cpu)
    rcu_dynticks_snap(rdtp) & 0xfff,
    rdtp->dynticks_nesting, rdtp->dynticks_nmi_nesting,
    rdp->softirq_snap, kstat_softirqs_cpu(RCU_SOFTIRQ, cpu),
    - READ_ONCE(rsp->n_force_qs) - rsp->n_force_qs_gpstart,
    + READ_ONCE(rcu_state.n_force_qs) - rcu_state.n_force_qs_gpstart,
    fast_no_hz);
    }

    --
    2.17.1
    \
     
     \ /
      Last update: 2018-08-30 00:40    [W:2.217 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site