Index: arch/hp700/hp700/locore.S
===================================================================
RCS file: /cvsroot/src/sys/arch/hp700/hp700/locore.S,v
retrieving revision 1.54
diff -u -p -u -r1.54 locore.S
--- arch/hp700/hp700/locore.S	1 Feb 2011 18:33:25 -0000	1.54
+++ arch/hp700/hp700/locore.S	7 Feb 2011 10:09:59 -0000
@@ -1101,7 +1101,6 @@ ENTRY_NOPROFILE(lwp_trampoline,HPPA_FRAM
 	.import	lwp_startup, code
 	CALL(lwp_startup, %r1)
 
-ALTENTRY(setfunc_trampoline)
 	/* get trampoline func (%t3) and arg (%arg0) */
 	ldw	HPPA_FRAME_ARG(3)(%sp), %arg0
 	ldw	HPPA_FRAME_ARG(2)(%sp), %t3
Index: arch/hp700/include/cpu.h
===================================================================
RCS file: /cvsroot/src/sys/arch/hp700/include/cpu.h,v
retrieving revision 1.65
diff -u -p -u -r1.65 cpu.h
--- arch/hp700/include/cpu.h	31 Jan 2011 18:21:33 -0000	1.65
+++ arch/hp700/include/cpu.h	7 Feb 2011 10:10:00 -0000
@@ -379,7 +379,6 @@ int	spstrcpy(pa_space_t, const void *, p
     size_t *);
 int	copy_on_fault(void);
 void	lwp_trampoline(void);
-void	setfunc_trampoline(void);
 int	cpu_dumpsize(void);
 int	cpu_dump(void);
 
Index: arch/hppa/hppa/vm_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/hppa/hppa/vm_machdep.c,v
retrieving revision 1.46
diff -u -p -u -r1.46 vm_machdep.c
--- arch/hppa/hppa/vm_machdep.c	23 Jan 2011 09:44:59 -0000	1.46
+++ arch/hppa/hppa/vm_machdep.c	7 Feb 2011 10:10:03 -0000
@@ -205,7 +205,7 @@ cpu_setfunc(struct lwp *l, void (*func)(
 
 	*(register_t *)(sp) = 0;	/* previous frame pointer */
 	*(register_t *)(sp + HPPA_FRAME_PSP) = osp;
-	*(register_t *)(sp + HPPA_FRAME_CRP) = (register_t)setfunc_trampoline;
+	*(register_t *)(sp + HPPA_FRAME_CRP) = (register_t)lwp_trampoline;
 
 	*HPPA_FRAME_CARG(2, sp) = KERNMODE(func);
 	*HPPA_FRAME_CARG(3, sp) = (register_t)arg;