diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c index 6c39a61ec115..acc7e7647cbb 100644 --- a/arch/arm64/kernel/traps.c +++ b/arch/arm64/kernel/traps.c @@ -414,7 +414,6 @@ NOKPROBE_SYMBOL(do_undefinstr); void do_bti(struct pt_regs *regs) { - trace_android_rvh_do_bti(regs, user_mode(regs)); BUG_ON(!user_mode(regs)); force_signal_inject(SIGILL, ILL_ILLOPC, regs->pc, 0); } diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index afbf68f586f7..8dc3d3c10435 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -237,7 +237,6 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_alter_mutex_list_add); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_mutex_unlock_slowpath); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_rwsem_wake_finish); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_do_undefinstr); -EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_do_bti); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_do_ptrauth_fault); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_bad_mode); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_arm64_serror_panic); diff --git a/include/trace/hooks/traps.h b/include/trace/hooks/traps.h index f8d56a207afc..d1ceb632c1d5 100644 --- a/include/trace/hooks/traps.h +++ b/include/trace/hooks/traps.h @@ -17,11 +17,6 @@ DECLARE_RESTRICTED_HOOK(android_rvh_do_undefinstr, TP_ARGS(regs, user), TP_CONDITION(!user)); -DECLARE_RESTRICTED_HOOK(android_rvh_do_bti, - TP_PROTO(struct pt_regs *regs, bool user), - TP_ARGS(regs, user), - TP_CONDITION(!user)); - DECLARE_RESTRICTED_HOOK(android_rvh_do_ptrauth_fault, TP_PROTO(struct pt_regs *regs, unsigned int esr, bool user), TP_ARGS(regs, esr, user),