| Message ID | 1580118575-1705-1-git-send-email-anshuman.khandual@arm.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 5cb7a1113f94cec20ff16d3981b94b7fdd8d73fa |
| Headers | show |
| Series | arm64: Drop do_el0_ia_bp_hardening() & do_sp_pc_abort() declarations | expand |
On Mon, Jan 27, 2020 at 03:19:35PM +0530, Anshuman Khandual wrote: > There is a redundant do_sp_pc_abort() declaration in exceptions.h which can > be removed. Also do_el0_ia_bp_hardening() as been already been dropped with > the commit bfe298745afc ("arm64: entry-common: don't touch daif before > bp-hardening") and hence does not need a declaration any more. This should > not introduce any functional change. > > Cc: Catalin Marinas <catalin.marinas@arm.com> > Cc: Will Deacon <will@kernel.org> > Cc: James Morse <james.morse@arm.com> > Cc: Mark Rutland <mark.rutland@arm.com> > Cc: Thomas Gleixner <tglx@linutronix.de> > Cc: linux-kernel@vger.kernel.org > Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com> Acked-by: Mark Rutland <mark.rutland@arm.com> Mark. > --- > arch/arm64/include/asm/exception.h | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/arch/arm64/include/asm/exception.h b/arch/arm64/include/asm/exception.h > index b87c6e276ab1..7a6e81ca23a8 100644 > --- a/arch/arm64/include/asm/exception.h > +++ b/arch/arm64/include/asm/exception.h > @@ -33,7 +33,6 @@ static inline u32 disr_to_esr(u64 disr) > > asmlinkage void enter_from_user_mode(void); > void do_mem_abort(unsigned long addr, unsigned int esr, struct pt_regs *regs); > -void do_sp_pc_abort(unsigned long addr, unsigned int esr, struct pt_regs *regs); > void do_undefinstr(struct pt_regs *regs); > asmlinkage void bad_mode(struct pt_regs *regs, int reason, unsigned int esr); > void do_debug_exception(unsigned long addr_if_watchpoint, unsigned int esr, > @@ -47,7 +46,4 @@ void bad_el0_sync(struct pt_regs *regs, int reason, unsigned int esr); > void do_cp15instr(unsigned int esr, struct pt_regs *regs); > void do_el0_svc(struct pt_regs *regs); > void do_el0_svc_compat(struct pt_regs *regs); > -void do_el0_ia_bp_hardening(unsigned long addr, unsigned int esr, > - struct pt_regs *regs); > - > #endif/* __ASM_EXCEPTION_H */ > -- > 2.20.1 > IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.
diff --git a/arch/arm64/include/asm/exception.h b/arch/arm64/include/asm/exception.h index b87c6e276ab1..7a6e81ca23a8 100644 --- a/arch/arm64/include/asm/exception.h +++ b/arch/arm64/include/asm/exception.h @@ -33,7 +33,6 @@ static inline u32 disr_to_esr(u64 disr) asmlinkage void enter_from_user_mode(void); void do_mem_abort(unsigned long addr, unsigned int esr, struct pt_regs *regs); -void do_sp_pc_abort(unsigned long addr, unsigned int esr, struct pt_regs *regs); void do_undefinstr(struct pt_regs *regs); asmlinkage void bad_mode(struct pt_regs *regs, int reason, unsigned int esr); void do_debug_exception(unsigned long addr_if_watchpoint, unsigned int esr, @@ -47,7 +46,4 @@ void bad_el0_sync(struct pt_regs *regs, int reason, unsigned int esr); void do_cp15instr(unsigned int esr, struct pt_regs *regs); void do_el0_svc(struct pt_regs *regs); void do_el0_svc_compat(struct pt_regs *regs); -void do_el0_ia_bp_hardening(unsigned long addr, unsigned int esr, - struct pt_regs *regs); - #endif /* __ASM_EXCEPTION_H */
There is a redundant do_sp_pc_abort() declaration in exceptions.h which can be removed. Also do_el0_ia_bp_hardening() as been already been dropped with the commit bfe298745afc ("arm64: entry-common: don't touch daif before bp-hardening") and hence does not need a declaration any more. This should not introduce any functional change. Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will@kernel.org> Cc: James Morse <james.morse@arm.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: linux-kernel@vger.kernel.org Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com> --- arch/arm64/include/asm/exception.h | 4 ---- 1 file changed, 4 deletions(-)