git: f9d590884ae3 - stable/13 - Rename linux_set_upcall_kse() to linux_set_upcall().

[John Baldwin]

The branch stable/13 has been updated by jhb:

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

commit f9d590884ae31a6689c9e472046f7176f3eb57c4
Author:     John Baldwin <jhb at FreeBSD.org>
AuthorDate: 2021-03-18 19:14:34 +0000
Commit:     John Baldwin <jhb at FreeBSD.org>
CommitDate: 2021-03-29 22:36:11 +0000

    Rename linux_set_upcall_kse() to linux_set_upcall().
    
    This matches the rename of cpu_set_upcall_kse() in
    5c2cf818454375536fda522ba83cf67c50929e6b.
    
    Sponsored by:   DARPA
    
    (cherry picked from commit 3b57ddb029daf225a8385dade491019269da82e8)
---
 sys/amd64/amd64/vm_machdep.c        | 2 +-
 sys/amd64/linux/linux_machdep.c     | 2 +-
 sys/amd64/linux32/linux32_machdep.c | 2 +-
 sys/arm64/linux/linux_machdep.c     | 8 ++++----
 sys/compat/linux/linux_fork.c       | 4 ++--
 sys/compat/linux/linux_misc.h       | 2 +-
 sys/i386/i386/vm_machdep.c          | 2 +-
 sys/i386/linux/linux_machdep.c      | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/sys/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep.c
index 0527ef95cf3b..f64259decbff 100644
--- a/sys/amd64/amd64/vm_machdep.c
+++ b/sys/amd64/amd64/vm_machdep.c
@@ -591,7 +591,7 @@ cpu_copy_thread(struct thread *td, struct thread *td0)
 	 * Copy user general-purpose registers.
 	 *
 	 * Some of these registers are rewritten by cpu_set_upcall()
-	 * and linux_set_upcall_kse().
+	 * and linux_set_upcall().
 	 */
 	bcopy(td0->td_frame, td->td_frame, sizeof(struct trapframe));
 
diff --git a/sys/amd64/linux/linux_machdep.c b/sys/amd64/linux/linux_machdep.c
index 1a9d79b0c1ba..4736fd3d1682 100644
--- a/sys/amd64/linux/linux_machdep.c
+++ b/sys/amd64/linux/linux_machdep.c
@@ -118,7 +118,7 @@ linux_execve(struct thread *td, struct linux_execve_args *args)
 }
 
 int
-linux_set_upcall_kse(struct thread *td, register_t stack)
+linux_set_upcall(struct thread *td, register_t stack)
 {
 
 	if (stack)
diff --git a/sys/amd64/linux32/linux32_machdep.c b/sys/amd64/linux32/linux32_machdep.c
index fde180d74d73..8ae82f3df8ca 100644
--- a/sys/amd64/linux32/linux32_machdep.c
+++ b/sys/amd64/linux32/linux32_machdep.c
@@ -418,7 +418,7 @@ linux_set_cloned_tls(struct thread *td, void *desc)
 }
 
 int
-linux_set_upcall_kse(struct thread *td, register_t stack)
+linux_set_upcall(struct thread *td, register_t stack)
 {
 
 	if (stack)
diff --git a/sys/arm64/linux/linux_machdep.c b/sys/arm64/linux/linux_machdep.c
index 512bf1cc3398..711ccb4fd63d 100644
--- a/sys/arm64/linux/linux_machdep.c
+++ b/sys/arm64/linux/linux_machdep.c
@@ -52,7 +52,7 @@ __FBSDID("$FreeBSD$");
 LIN_SDT_PROVIDER_DECLARE(LINUX_DTRACE);
 
 /* DTrace probes */
-LIN_SDT_PROBE_DEFINE0(machdep, linux_set_upcall_kse, todo);
+LIN_SDT_PROBE_DEFINE0(machdep, linux_set_upcall, todo);
 LIN_SDT_PROBE_DEFINE0(machdep, linux_mmap2, todo);
 LIN_SDT_PROBE_DEFINE0(machdep, linux_rt_sigsuspend, todo);
 LIN_SDT_PROBE_DEFINE0(machdep, linux_sigaltstack, todo);
@@ -84,12 +84,12 @@ linux_execve(struct thread *td, struct linux_execve_args *uap)
 	return (error);
 }
 
-/* LINUXTODO: implement (or deduplicate) arm64 linux_set_upcall_kse */
+/* LINUXTODO: implement (or deduplicate) arm64 linux_set_upcall */
 int
-linux_set_upcall_kse(struct thread *td, register_t stack)
+linux_set_upcall(struct thread *td, register_t stack)
 {
 
-	LIN_SDT_PROBE0(machdep, linux_set_upcall_kse, todo);
+	LIN_SDT_PROBE0(machdep, linux_set_upcall, todo);
 	return (EDOOFUS);
 }
 
diff --git a/sys/compat/linux/linux_fork.c b/sys/compat/linux/linux_fork.c
index 3ba40fc2705e..ed4adcf8a175 100644
--- a/sys/compat/linux/linux_fork.c
+++ b/sys/compat/linux/linux_fork.c
@@ -205,7 +205,7 @@ linux_clone_proc(struct thread *td, struct linux_clone_args *args)
 	 * stack. This is what normal fork() does, so we just keep tf_rsp arg
 	 * intact.
 	 */
-	linux_set_upcall_kse(td2, PTROUT(args->stack));
+	linux_set_upcall(td2, PTROUT(args->stack));
 
 	if (args->flags & LINUX_CLONE_SETTLS)
 		linux_set_cloned_tls(td2, args->tls);
@@ -304,7 +304,7 @@ linux_clone_thread(struct thread *td, struct linux_clone_args *args)
 
 	cpu_thread_clean(newtd);
 
-	linux_set_upcall_kse(newtd, PTROUT(args->stack));
+	linux_set_upcall(newtd, PTROUT(args->stack));
 
 	PROC_LOCK(p);
 	p->p_flag |= P_HADTHREADS;
diff --git a/sys/compat/linux/linux_misc.h b/sys/compat/linux/linux_misc.h
index c7e4fa38682c..da76753e3d24 100644
--- a/sys/compat/linux/linux_misc.h
+++ b/sys/compat/linux/linux_misc.h
@@ -181,7 +181,7 @@ extern int stclohz;
 int linux_ptrace_status(struct thread *td, int pid, int status);
 #endif
 void linux_to_bsd_waitopts(int options, int *bsdopts);
-int linux_set_upcall_kse(struct thread *td, register_t stack);
+int linux_set_upcall(struct thread *td, register_t stack);
 int linux_set_cloned_tls(struct thread *td, void *desc);
 struct thread	*linux_tdfind(struct thread *, lwpid_t, pid_t);
 
diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c
index 5bbdfdb77b2d..c04fb57db4b1 100644
--- a/sys/i386/i386/vm_machdep.c
+++ b/sys/i386/i386/vm_machdep.c
@@ -461,7 +461,7 @@ cpu_copy_thread(struct thread *td, struct thread *td0)
 	 * Copy user general-purpose registers.
 	 *
 	 * Some of these registers are rewritten by cpu_set_upcall()
-	 * and linux_set_upcall_kse().
+	 * and linux_set_upcall().
 	 */
 	bcopy(td0->td_frame, td->td_frame, sizeof(struct trapframe));
 
diff --git a/sys/i386/linux/linux_machdep.c b/sys/i386/linux/linux_machdep.c
index 624a6ef6ae87..d2d713d4776d 100644
--- a/sys/i386/linux/linux_machdep.c
+++ b/sys/i386/linux/linux_machdep.c
@@ -314,7 +314,7 @@ linux_set_cloned_tls(struct thread *td, void *desc)
 }
 
 int
-linux_set_upcall_kse(struct thread *td, register_t stack)
+linux_set_upcall(struct thread *td, register_t stack)
 {
 
 	if (stack)