Messages in this thread Patch in this message |  | | From | Christophe Leroy <> | Subject | [RFC PATCH v1 34/41] powerpc/32: Set current->thread.regs in C interrupt entry | Date | Tue, 9 Feb 2021 09:56:59 +0000 (UTC) |
| |
No need to do that is assembly, do it in C.
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> --- arch/powerpc/include/asm/interrupt.h | 4 +++- arch/powerpc/kernel/entry_32.S | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/arch/powerpc/include/asm/interrupt.h b/arch/powerpc/include/asm/interrupt.h index d70c761edc00..550ad1d69a7b 100644 --- a/arch/powerpc/include/asm/interrupt.h +++ b/arch/powerpc/include/asm/interrupt.h @@ -20,8 +20,10 @@ static inline void interrupt_enter_prepare(struct pt_regs *regs, struct interrup if (regs->msr & MSR_EE) trace_hardirqs_off(); - if (user_mode(regs)) + if (user_mode(regs)) { + current->thread.regs = regs; account_cpu_user_entry(); + } #endif /* * Book3E reconciles irq soft mask in asm diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S index fd24520b2e0c..71ef5ab84b03 100644 --- a/arch/powerpc/kernel/entry_32.S +++ b/arch/powerpc/kernel/entry_32.S @@ -59,8 +59,7 @@ prepare_transfer_to_handler: andi. r0,r9,MSR_PR addi r12, r2, THREAD - beq 2f /* if from user, fix up THREAD.regs */ - stw r3,PT_REGS(r12) + beq 2f #ifdef CONFIG_PPC_BOOK3S_32 kuep_lock r11, r12 #endif -- 2.25.0
|  |