The branch stable/13 has been updated by trasz: URL: https://cgit.FreeBSD.org/src/commit/?id=95f24ec842b5ddb2dbfed16a256d0b5f6656516d
commit 95f24ec842b5ddb2dbfed16a256d0b5f6656516d Author: Edward Tomasz Napierala <[email protected]> AuthorDate: 2021-07-13 09:52:13 +0000 Commit: Edward Tomasz Napierala <[email protected]> CommitDate: 2022-02-14 00:09:05 +0000 linux(4): remove unfinished vsyscall bits on arm64 The vsyscall mechanism is obsolete. Reviewed By: dchagin, emaste Sponsored By: EPSRC Differential Revision: https://reviews.freebsd.org/D31091 (cherry picked from commit 84a3963d5d94be05c913d04ea0cef4ac69a8bfc7) --- sys/arm64/linux/linux_sysvec.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/sys/arm64/linux/linux_sysvec.c b/sys/arm64/linux/linux_sysvec.c index de8dd023f82d..7fe6ab781218 100644 --- a/sys/arm64/linux/linux_sysvec.c +++ b/sys/arm64/linux/linux_sysvec.c @@ -90,7 +90,6 @@ static void linux_set_syscall_retval(struct thread *td, int error); static int linux_fetch_syscall_args(struct thread *td); static void linux_exec_setregs(struct thread *td, struct image_params *imgp, uintptr_t stack); -static int linux_vsyscall(struct thread *td); /* DTrace init */ LIN_SDT_PROVIDER_DECLARE(LINUX_DTRACE); @@ -102,7 +101,6 @@ LIN_SDT_PROBE_DEFINE0(sysvec, linux_copyout_auxargs, todo); LIN_SDT_PROBE_DEFINE0(sysvec, linux_elf_fixup, todo); LIN_SDT_PROBE_DEFINE0(sysvec, linux_rt_sigreturn, todo); LIN_SDT_PROBE_DEFINE0(sysvec, linux_rt_sendsig, todo); -LIN_SDT_PROBE_DEFINE0(sysvec, linux_vsyscall, todo); LIN_SDT_PROBE_DEFINE0(sysvec, linux_vdso_install, todo); LIN_SDT_PROBE_DEFINE0(sysvec, linux_vdso_deinstall, todo); @@ -396,15 +394,6 @@ linux_rt_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) LIN_SDT_PROBE0(sysvec, linux_rt_sendsig, todo); } -static int -linux_vsyscall(struct thread *td) -{ - - /* LINUXTODO: implement */ - LIN_SDT_PROBE0(sysvec, linux_vsyscall, todo); - return (EDOOFUS); -} - struct sysentvec elf_linux_sysvec = { .sv_size = LINUX_SYS_MAXSYSCALL, .sv_table = linux_sysent, @@ -437,7 +426,7 @@ struct sysentvec elf_linux_sysvec = { .sv_shared_page_len = PAGE_SIZE, .sv_schedtail = linux_schedtail, .sv_thread_detach = linux_thread_detach, - .sv_trap = linux_vsyscall, + .sv_trap = NULL, .sv_hwcap = &elf_hwcap, .sv_hwcap2 = &elf_hwcap2, .sv_onexec = linux_on_exec,
