Date: Fri, 17 Jun 2022 19:36:54 GMT From: Dmitry Chagin <dchagin@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: b960dd481535 - stable/13 - linux(4): Constify vdso install/deinstall. Message-ID: <202206171936.25HJasmE012654@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=b960dd481535dae25324df708bedf55d4f2b8472 commit b960dd481535dae25324df708bedf55d4f2b8472 Author: Dmitry Chagin <dchagin@FreeBSD.org> AuthorDate: 2021-07-20 07:01:47 +0000 Commit: Dmitry Chagin <dchagin@FreeBSD.org> CommitDate: 2022-06-17 19:33:07 +0000 linux(4): Constify vdso install/deinstall. In order to reduce diff between arches constify vdso install/deinstall functions like arm64. Reviewed by: emaste Differential revision: https://reviews.freebsd.org/D30901 MFC after: 2 weeks (cherry picked from commit a543556c8128c52fb044250b8f52f9702c81788d) --- sys/amd64/linux/linux_sysvec.c | 8 ++++---- sys/amd64/linux32/linux32_sysvec.c | 8 ++++---- sys/i386/linux/linux_sysvec.c | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sys/amd64/linux/linux_sysvec.c b/sys/amd64/linux/linux_sysvec.c index f13526b00d85..092452366fba 100644 --- a/sys/amd64/linux/linux_sysvec.c +++ b/sys/amd64/linux/linux_sysvec.c @@ -115,8 +115,8 @@ static int linux_copyout_strings(struct image_params *imgp, static int linux_fixup_elf(uintptr_t *stack_base, struct image_params *iparams); static bool linux_trans_osrel(const Elf_Note *note, int32_t *osrel); -static void linux_vdso_install(void *param); -static void linux_vdso_deinstall(void *param); +static void linux_vdso_install(const void *param); +static void linux_vdso_deinstall(const void *param); static void linux_vdso_reloc(char *mapping, Elf_Addr offset); static void linux_set_syscall_retval(struct thread *td, int error); static int linux_fetch_syscall_args(struct thread *td); @@ -824,7 +824,7 @@ SYSINIT(elf_linux_exec_sysvec_init, SI_SUB_EXEC, SI_ORDER_ANY, linux_exec_sysvec_init, &elf_linux_sysvec); static void -linux_vdso_install(void *param) +linux_vdso_install(const void *param) { char *vdso_start = &_binary_linux_vdso_so_o_start; char *vdso_end = &_binary_linux_vdso_so_o_end; @@ -848,7 +848,7 @@ SYSINIT(elf_linux_vdso_init, SI_SUB_EXEC, SI_ORDER_FIRST, linux_vdso_install, NULL); static void -linux_vdso_deinstall(void *param) +linux_vdso_deinstall(const void *param) { __elfN(linux_shared_page_fini)(linux_vdso_obj, diff --git a/sys/amd64/linux32/linux32_sysvec.c b/sys/amd64/linux32/linux32_sysvec.c index 10f616c56510..a97ac7337120 100644 --- a/sys/amd64/linux32/linux32_sysvec.c +++ b/sys/amd64/linux32/linux32_sysvec.c @@ -125,8 +125,8 @@ static int linux_on_exec_vmspace(struct proc *p, struct image_params *imgp); static void linux32_fixlimit(struct rlimit *rl, int which); static bool linux32_trans_osrel(const Elf_Note *note, int32_t *osrel); -static void linux_vdso_install(void *param); -static void linux_vdso_deinstall(void *param); +static void linux_vdso_install(const void *param); +static void linux_vdso_deinstall(const void *param); static void linux_vdso_reloc(char *mapping, Elf_Addr offset); static void linux32_set_syscall_retval(struct thread *td, int error); @@ -986,7 +986,7 @@ SYSINIT(elf_linux_exec_sysvec_init, SI_SUB_EXEC, SI_ORDER_ANY, linux_exec_sysvec_init, &elf_linux_sysvec); static void -linux_vdso_install(void *param) +linux_vdso_install(const void *param) { char *vdso_start = &_binary_linux32_vdso_so_o_start; char *vdso_end = &_binary_linux32_vdso_so_o_end; @@ -1008,7 +1008,7 @@ SYSINIT(elf_linux_vdso_init, SI_SUB_EXEC, SI_ORDER_FIRST, linux_vdso_install, NULL); static void -linux_vdso_deinstall(void *param) +linux_vdso_deinstall(const void *param) { __elfN(linux_shared_page_fini)(linux_vdso_obj, diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c index 0736fb8734d8..b15854ff85a8 100644 --- a/sys/i386/linux/linux_sysvec.c +++ b/sys/i386/linux/linux_sysvec.c @@ -111,8 +111,8 @@ static int linux_on_exec_vmspace(struct proc *p, static int linux_copyout_strings(struct image_params *imgp, uintptr_t *stack_base); static bool linux_trans_osrel(const Elf_Note *note, int32_t *osrel); -static void linux_vdso_install(void *param); -static void linux_vdso_deinstall(void *param); +static void linux_vdso_install(const void *param); +static void linux_vdso_deinstall(const void *param); static void linux_vdso_reloc(char *mapping, Elf_Addr offset); #define LINUX_T_UNKNOWN 255 @@ -937,7 +937,7 @@ SYSINIT(elf_linux_exec_sysvec_init, SI_SUB_EXEC, SI_ORDER_ANY, linux_exec_sysvec_init, &elf_linux_sysvec); static void -linux_vdso_install(void *param) +linux_vdso_install(const void *param) { char *vdso_start = &_binary_linux_vdso_so_o_start; char *vdso_end = &_binary_linux_vdso_so_o_end; @@ -959,7 +959,7 @@ SYSINIT(elf_linux_vdso_init, SI_SUB_EXEC, SI_ORDER_FIRST, linux_vdso_install, NULL); static void -linux_vdso_deinstall(void *param) +linux_vdso_deinstall(const void *param) { __elfN(linux_shared_page_fini)(linux_vdso_obj,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202206171936.25HJasmE012654>