Commit d608898a authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc: clean stack pointers naming 



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: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent c911d2e1

arch/powerpc/kernel/irq.c

+7 −10
Original line number Diff line number Diff line
@@ -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)

arch/powerpc/kernel/setup_64.c

+3 −8
Original line number Diff line number Diff line
@@ -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

	}

}