Skip to content

Commit 5cb7a11

Browse files
Anshuman Khandualwilldeacon
authored andcommitted
arm64: Drop do_el0_ia_bp_hardening() & do_sp_pc_abort() declarations
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 bfe2987 ("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 <[email protected]> Cc: Will Deacon <[email protected]> Cc: James Morse <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: [email protected] Acked-by: Mark Rutland <[email protected]> Signed-off-by: Anshuman Khandual <[email protected]> Signed-off-by: Will Deacon <[email protected]>
1 parent bb6d3fb commit 5cb7a11

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

arch/arm64/include/asm/exception.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ static inline u32 disr_to_esr(u64 disr)
3333

3434
asmlinkage void enter_from_user_mode(void);
3535
void do_mem_abort(unsigned long addr, unsigned int esr, struct pt_regs *regs);
36-
void do_sp_pc_abort(unsigned long addr, unsigned int esr, struct pt_regs *regs);
3736
void do_undefinstr(struct pt_regs *regs);
3837
asmlinkage void bad_mode(struct pt_regs *regs, int reason, unsigned int esr);
3938
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);
4746
void do_cp15instr(unsigned int esr, struct pt_regs *regs);
4847
void do_el0_svc(struct pt_regs *regs);
4948
void do_el0_svc_compat(struct pt_regs *regs);
50-
void do_el0_ia_bp_hardening(unsigned long addr, unsigned int esr,
51-
struct pt_regs *regs);
52-
5349
#endif /* __ASM_EXCEPTION_H */

0 commit comments

Comments
 (0)