The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=f34a9180ae881dc77ea42ab38e992828b1567a5d
commit f34a9180ae881dc77ea42ab38e992828b1567a5d Author: Dmitry Chagin <dcha...@freebsd.org> AuthorDate: 2022-05-20 11:19:51 +0000 Commit: Dmitry Chagin <dcha...@freebsd.org> CommitDate: 2022-05-20 11:19:51 +0000 linux(4): Retire unneeded translate_traps from arm64 MFC after: 2 weeks --- sys/arm64/linux/linux_sysvec.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/sys/arm64/linux/linux_sysvec.c b/sys/arm64/linux/linux_sysvec.c index e82539b9c5b1..04467b25ca6e 100644 --- a/sys/arm64/linux/linux_sysvec.c +++ b/sys/arm64/linux/linux_sysvec.c @@ -121,7 +121,6 @@ static int linux_on_exec_vmspace(struct proc *p, LIN_SDT_PROVIDER_DECLARE(LINUX_DTRACE); /* DTrace probes */ -LIN_SDT_PROBE_DEFINE2(sysvec, linux_translate_traps, todo, "int", "int"); LIN_SDT_PROBE_DEFINE0(sysvec, linux_exec_setregs, todo); LIN_SDT_PROBE_DEFINE0(sysvec, linux_copyout_auxargs, todo); LIN_SDT_PROBE_DEFINE0(sysvec, linux_elf_fixup, todo); @@ -130,15 +129,6 @@ LINUX_VDSO_SYM_CHAR(linux_platform); LINUX_VDSO_SYM_INTPTR(kern_timekeep_base); LINUX_VDSO_SYM_INTPTR(linux_vdso_sigcode); -/* LINUXTODO: do we have traps to translate? */ -static int -linux_translate_traps(int signal, int trap_code) -{ - - LIN_SDT_PROBE2(sysvec, linux_translate_traps, todo, signal, trap_code); - return (signal); -} - static int linux_fetch_syscall_args(struct thread *td) { @@ -554,7 +544,7 @@ linux_rt_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) struct sysentvec elf_linux_sysvec = { .sv_size = LINUX_SYS_MAXSYSCALL, .sv_table = linux_sysent, - .sv_transtrap = linux_translate_traps, + .sv_transtrap = NULL, .sv_fixup = linux_elf_fixup, .sv_sendsig = linux_rt_sendsig, .sv_sigcode = &_binary_linux_vdso_so_o_start,