On Tue, Dec 01, 2020 at 10:05:47AM +1100, Stephen Rothwell wrote: > diff --cc arch/arm64/include/asm/exception.h > index 0756191f44f6,2a8aa1884d8a..000000000000 > --- a/arch/arm64/include/asm/exception.h > +++ b/arch/arm64/include/asm/exception.h > @@@ -31,13 -31,8 +31,13 @@@ static inline u32 disr_to_esr(u64 disr > return esr; > } > > +asmlinkage void noinstr enter_el1_irq_or_nmi(struct pt_regs *regs); > +asmlinkage void noinstr exit_el1_irq_or_nmi(struct pt_regs *regs); > asmlinkage void enter_from_user_mode(void); > +asmlinkage void exit_to_user_mode(void); > +void arm64_enter_nmi(struct pt_regs *regs); > +void arm64_exit_nmi(struct pt_regs *regs); > - void do_mem_abort(unsigned long addr, unsigned int esr, struct pt_regs *regs); > + void do_mem_abort(unsigned long far, unsigned int esr, struct pt_regs *regs); > void do_undefinstr(struct pt_regs *regs); > void do_bti(struct pt_regs *regs); > asmlinkage void bad_mode(struct pt_regs *regs, int reason, unsigned int esr); Thanks Stephen. It looks alright. -- Catalin
