Module Name: src
Committed By: snj
Date: Mon Feb 22 16:05:59 UTC 2010
Modified Files:
src/sys/arch/hppa/hppa [netbsd-5-0]: vm_machdep.c
Log Message:
Apply patch (requested by skrll in ticket #1312):
Fix ticket #793: s/setfunc_trampoline/lwp_trampoline/.
To generate a diff of this commit:
cvs rdiff -u -r1.33.6.1 -r1.33.6.2 src/sys/arch/hppa/hppa/vm_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hppa/hppa/vm_machdep.c
diff -u src/sys/arch/hppa/hppa/vm_machdep.c:1.33.6.1 src/sys/arch/hppa/hppa/vm_machdep.c:1.33.6.2
--- src/sys/arch/hppa/hppa/vm_machdep.c:1.33.6.1 Fri Jun 5 18:56:01 2009
+++ src/sys/arch/hppa/hppa/vm_machdep.c Mon Feb 22 16:05:59 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.33.6.1 2009/06/05 18:56:01 snj Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.33.6.2 2010/02/22 16:05:59 snj Exp $ */
/* $OpenBSD: vm_machdep.c,v 1.25 2001/09/19 20:50:56 mickey Exp $ */
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.33.6.1 2009/06/05 18:56:01 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.33.6.2 2010/02/22 16:05:59 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -208,7 +208,7 @@
sp += HPPA_FRAME_SIZE;
*(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;
@@ -244,7 +244,7 @@
sp += HPPA_FRAME_SIZE;
*(register_t *)(sp + HPPA_FRAME_PSP) = osp;
- *(register_t *)(sp + HPPA_FRAME_CRP) = (register_t)lwp_trampoline;
+ *(register_t *)(sp + HPPA_FRAME_CRP) = (register_t)setfunc_trampoline;
*HPPA_FRAME_CARG(2, sp) = KERNMODE(func);
*HPPA_FRAME_CARG(3, sp) = (register_t)arg;
