From 938f15c7c4adf3b9307cace12d884c338694f6a4 Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Thu, 22 Feb 2001 16:56:53 +0000 Subject: [PATCH] Rename switch_trampoline() to fork_trampoline() on the alpha and ia64. Suggested by: dfr --- sys/alpha/alpha/swtch.s | 6 +++--- sys/alpha/alpha/vm_machdep.c | 2 +- sys/alpha/include/cpu.h | 2 +- sys/ia64/ia64/swtch.s | 6 +++--- sys/ia64/ia64/vm_machdep.c | 4 ++-- sys/ia64/include/cpu.h | 2 +- sys/powerpc/aim/vm_machdep.c | 2 +- sys/powerpc/powerpc/vm_machdep.c | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/sys/alpha/alpha/swtch.s b/sys/alpha/alpha/swtch.s index 63443530f0d7..1935c3ee3d6d 100644 --- a/sys/alpha/alpha/swtch.s +++ b/sys/alpha/alpha/swtch.s @@ -193,7 +193,7 @@ Lcs7: /* - * switch_trampoline() + * fork_trampoline() * * Arrange for a function to be invoked neatly, after a cpu_switch(). * @@ -204,10 +204,10 @@ Lcs7: * The callout function is in s0, the address to return to after executing * fork_exit() is in s1, and the argument is in s2. */ -LEAF(switch_trampoline, 0) +LEAF(fork_trampoline, 0) mov s1, ra mov s0, a0 mov s2, a1 mov sp, a2 jmp zero, fork_exit - END(switch_trampoline) + END(fork_trampoline) diff --git a/sys/alpha/alpha/vm_machdep.c b/sys/alpha/alpha/vm_machdep.c index e9e65408bb55..e110d2945eab 100644 --- a/sys/alpha/alpha/vm_machdep.c +++ b/sys/alpha/alpha/vm_machdep.c @@ -209,7 +209,7 @@ cpu_fork(p1, p2, flags) (u_int64_t)exception_return; /* s1: ra */ up->u_pcb.pcb_context[2] = (u_long) p2; /* s2: a1 */ up->u_pcb.pcb_context[7] = - (u_int64_t)switch_trampoline; /* ra: assembly magic */ + (u_int64_t)fork_trampoline; /* ra: assembly magic */ } } diff --git a/sys/alpha/include/cpu.h b/sys/alpha/include/cpu.h index 798f8ddc59b5..d8ff1cc27c4b 100644 --- a/sys/alpha/include/cpu.h +++ b/sys/alpha/include/cpu.h @@ -155,7 +155,7 @@ void regtoframe __P((struct reg *, struct trapframe *)); void savectx __P((struct pcb *)); void set_iointr __P((void (*)(void *, unsigned long))); void switch_exit __P((struct proc *)); /* MAGIC */ -void switch_trampoline __P((void)); /* MAGIC */ +void fork_trampoline __P((void)); /* MAGIC */ void syscall __P((u_int64_t, struct trapframe *)); void trap __P((unsigned long, unsigned long, unsigned long, unsigned long, struct trapframe *)); diff --git a/sys/ia64/ia64/swtch.s b/sys/ia64/ia64/swtch.s index a08bc25517a2..10f568e3db6b 100644 --- a/sys/ia64/ia64/swtch.s +++ b/sys/ia64/ia64/swtch.s @@ -612,7 +612,7 @@ ENTRY(restorehighfp, 1) END(restorehighfp) /* - * switch_trampoline() + * fork_trampoline() * * Arrange for a function to be invoked neatly, after a cpu_switch(). * @@ -623,7 +623,7 @@ END(restorehighfp) * The callout function is in r4, the address to return to after executing * fork_exit() is in r5, and the argument is in r6. */ -ENTRY(switch_trampoline, 0) +ENTRY(fork_trampoline, 0) alloc r14=ar.pfs,0,0,3,0 ;; mov b0=r5 @@ -633,5 +633,5 @@ ENTRY(switch_trampoline, 0) ;; br.call.sptk.few b6=fork_exit - END(switch_trampoline) + END(fork_trampoline) diff --git a/sys/ia64/ia64/vm_machdep.c b/sys/ia64/ia64/vm_machdep.c index 4a280d6201cd..09ce46216956 100644 --- a/sys/ia64/ia64/vm_machdep.c +++ b/sys/ia64/ia64/vm_machdep.c @@ -256,7 +256,7 @@ cpu_fork(p1, p2, flags) * child process doesn't stay in the kernel for long! * * We should really deal with the function descriptor - * for fork_return() in switch_trampoline() so that a + * for fork_return() in fork_trampoline() so that a * kthread started from a loaded module can have the * right value for gp. */ @@ -264,7 +264,7 @@ cpu_fork(p1, p2, flags) up->u_pcb.pcb_r4 = FDESC_FUNC(fork_return); up->u_pcb.pcb_r5 = FDESC_FUNC(exception_restore); up->u_pcb.pcb_r6 = (u_int64_t)p2; - up->u_pcb.pcb_b0 = FDESC_FUNC(switch_trampoline); + up->u_pcb.pcb_b0 = FDESC_FUNC(fork_trampoline); } } diff --git a/sys/ia64/include/cpu.h b/sys/ia64/include/cpu.h index 98629b69c657..5a5257a17684 100644 --- a/sys/ia64/include/cpu.h +++ b/sys/ia64/include/cpu.h @@ -151,7 +151,7 @@ int savectx __P((struct pcb *)); void restorectx __P((struct pcb *)); void set_iointr __P((void (*)(void *, unsigned long))); void switch_exit __P((struct proc *)); /* MAGIC */ -void switch_trampoline __P((void)); /* MAGIC */ +void fork_trampoline __P((void)); /* MAGIC */ void syscall __P((int, u_int64_t *, struct trapframe *)); void trap __P((int vector, int imm, struct trapframe *framep)); diff --git a/sys/powerpc/aim/vm_machdep.c b/sys/powerpc/aim/vm_machdep.c index e9e65408bb55..e110d2945eab 100644 --- a/sys/powerpc/aim/vm_machdep.c +++ b/sys/powerpc/aim/vm_machdep.c @@ -209,7 +209,7 @@ cpu_fork(p1, p2, flags) (u_int64_t)exception_return; /* s1: ra */ up->u_pcb.pcb_context[2] = (u_long) p2; /* s2: a1 */ up->u_pcb.pcb_context[7] = - (u_int64_t)switch_trampoline; /* ra: assembly magic */ + (u_int64_t)fork_trampoline; /* ra: assembly magic */ } } diff --git a/sys/powerpc/powerpc/vm_machdep.c b/sys/powerpc/powerpc/vm_machdep.c index e9e65408bb55..e110d2945eab 100644 --- a/sys/powerpc/powerpc/vm_machdep.c +++ b/sys/powerpc/powerpc/vm_machdep.c @@ -209,7 +209,7 @@ cpu_fork(p1, p2, flags) (u_int64_t)exception_return; /* s1: ra */ up->u_pcb.pcb_context[2] = (u_long) p2; /* s2: a1 */ up->u_pcb.pcb_context[7] = - (u_int64_t)switch_trampoline; /* ra: assembly magic */ + (u_int64_t)fork_trampoline; /* ra: assembly magic */ } }