lkml.org 
[lkml]   [2019]   [Jan]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v13 10/10] powerpc: clean stack pointers naming
    Date
    Some stack pointers used to also be thread_info pointers
    and were called tp. Now that they are only stack pointers,
    rename them sp.

    Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
    ---
    arch/powerpc/kernel/irq.c | 17 +++++++----------
    arch/powerpc/kernel/setup_64.c | 11 +++--------
    2 files changed, 10 insertions(+), 18 deletions(-)

    diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
    index 1aef9316345f..983e53b427c0 100644
    --- a/arch/powerpc/kernel/irq.c
    +++ b/arch/powerpc/kernel/irq.c
    @@ -659,21 +659,21 @@ void __do_irq(struct pt_regs *regs)
    void do_IRQ(struct pt_regs *regs)
    {
    struct pt_regs *old_regs = set_irq_regs(regs);
    - void *curtp, *irqtp, *sirqtp;
    + void *cursp, *irqsp, *sirqsp;

    /* Switch to the irq stack to handle this */
    - curtp = (void *)(current_stack_pointer() & ~(THREAD_SIZE - 1));
    - irqtp = hardirq_ctx[raw_smp_processor_id()];
    - sirqtp = softirq_ctx[raw_smp_processor_id()];
    + cursp = (void *)(current_stack_pointer() & ~(THREAD_SIZE - 1));
    + irqsp = hardirq_ctx[raw_smp_processor_id()];
    + sirqsp = softirq_ctx[raw_smp_processor_id()];

    /* Already there ? */
    - if (unlikely(curtp == irqtp || curtp == sirqtp)) {
    + if (unlikely(cursp == irqsp || cursp == sirqsp)) {
    __do_irq(regs);
    set_irq_regs(old_regs);
    return;
    }
    /* Switch stack and call */
    - call_do_irq(regs, irqtp);
    + call_do_irq(regs, irqsp);

    set_irq_regs(old_regs);
    }
    @@ -695,10 +695,7 @@ void *hardirq_ctx[NR_CPUS] __read_mostly;

    void do_softirq_own_stack(void)
    {
    - void *irqtp;
    -
    - irqtp = softirq_ctx[smp_processor_id()];
    - call_do_softirq(irqtp);
    + call_do_softirq(softirq_ctx[smp_processor_id()]);
    }

    irq_hw_number_t virq_to_hw(unsigned int virq)
    diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
    index 2db1c5f7d141..daa361fc6a24 100644
    --- a/arch/powerpc/kernel/setup_64.c
    +++ b/arch/powerpc/kernel/setup_64.c
    @@ -716,19 +716,14 @@ void __init emergency_stack_init(void)
    limit = min(ppc64_bolted_size(), ppc64_rma_size);

    for_each_possible_cpu(i) {
    - void *ti;
    -
    - ti = alloc_stack(limit, i);
    - paca_ptrs[i]->emergency_sp = ti + THREAD_SIZE;
    + paca_ptrs[i]->emergency_sp = alloc_stack(limit, i) + THREAD_SIZE;

    #ifdef CONFIG_PPC_BOOK3S_64
    /* emergency stack for NMI exception handling. */
    - ti = alloc_stack(limit, i);
    - paca_ptrs[i]->nmi_emergency_sp = ti + THREAD_SIZE;
    + paca_ptrs[i]->nmi_emergency_sp = alloc_stack(limit, i) + THREAD_SIZE;

    /* emergency stack for machine check exception handling. */
    - ti = alloc_stack(limit, i);
    - paca_ptrs[i]->mc_emergency_sp = ti + THREAD_SIZE;
    + paca_ptrs[i]->mc_emergency_sp = alloc_stack(limit, i) + THREAD_SIZE;
    #endif
    }
    }
    --
    2.13.3
    \
     
     \ /
      Last update: 2019-01-12 10:56    [W:2.761 / U:0.284 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site