arm64: Drop do_el0_ia_bp_hardening() & do_sp_pc_abort() declarations (5cb7a111) · Commits · 戴 / test

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 ("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: Thomas Gleixner <tglx@linutronix.de> Cc: linux-kernel@vger.kernel.org Acked-by:

Mark Rutland <mark.rutland@arm.com> Signed-off-by:

Anshuman Khandual <anshuman.khandual@arm.com> Signed-off-by:

Will Deacon <will@kernel.org>

arch/arm64/include/asm/exception.h

+0 −4

Original line number	Diff line number	Diff line
		@@ -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 */

Admin message