git: a543556c8128 - main - linux(4): Constify vdso install/deinstall.

Dmitry Chagin dchagin at FreeBSD.org
Tue Jul 20 07:10:29 UTC 2021


The branch main has been updated by dchagin:

URL: https://cgit.FreeBSD.org/src/commit/?id=a543556c8128c52fb044250b8f52f9702c81788d

commit a543556c8128c52fb044250b8f52f9702c81788d
Author:     Dmitry Chagin <dchagin at FreeBSD.org>
AuthorDate: 2021-07-20 07:01:47 +0000
Commit:     Dmitry Chagin <dchagin at FreeBSD.org>
CommitDate: 2021-07-20 07:01:47 +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
---
 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 7be7411a960a..999f22a410ab 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);
@@ -830,7 +830,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;
@@ -854,7 +854,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 165eb7b2a1d2..720df298b670 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);
 
@@ -995,7 +995,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;
@@ -1017,7 +1017,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 f630a0e1f659..833819101ed0 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
@@ -940,7 +940,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;
@@ -962,7 +962,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,


More information about the dev-commits-src-all mailing list