Module Name: src
Committed By: snj
Date: Fri Jun 5 18:56:01 UTC 2009
Modified Files:
src/sys/arch/hp700/hp700 [netbsd-5-0]: locore.S
src/sys/arch/hp700/include [netbsd-5-0]: cpu.h
src/sys/arch/hppa/hppa [netbsd-5-0]: vm_machdep.c
Log Message:
Pull up following revision(s) (requested by skrll in ticket #793):
sys/arch/hppa/hppa/vm_machdep.c: revision 1.36
sys/arch/hp700/include/cpu.h: revision 1.34
sys/arch/hp700/hp700/locore.S: revision 1.35
Do not use lwp_trampoline for cpu_setfunc, but a simplified setfunc_trampoline
that does not call lwp_startup().
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.30.10.1 src/sys/arch/hp700/hp700/locore.S
cvs rdiff -u -r1.28 -r1.28.10.1 src/sys/arch/hp700/include/cpu.h
cvs rdiff -u -r1.33 -r1.33.6.1 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/hp700/hp700/locore.S
diff -u src/sys/arch/hp700/hp700/locore.S:1.30 src/sys/arch/hp700/hp700/locore.S:1.30.10.1
--- src/sys/arch/hp700/hp700/locore.S:1.30 Fri Aug 8 17:23:19 2008
+++ src/sys/arch/hp700/hp700/locore.S Fri Jun 5 18:56:01 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.30 2008/08/08 17:23:19 skrll Exp $ */
+/* $NetBSD: locore.S,v 1.30.10.1 2009/06/05 18:56:01 snj Exp $ */
/* $OpenBSD: locore.S,v 1.46 2001/09/20 18:33:03 mickey Exp $ */
/*
@@ -908,6 +908,7 @@
.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: src/sys/arch/hp700/include/cpu.h
diff -u src/sys/arch/hp700/include/cpu.h:1.28 src/sys/arch/hp700/include/cpu.h:1.28.10.1
--- src/sys/arch/hp700/include/cpu.h:1.28 Sat Sep 6 09:45:57 2008
+++ src/sys/arch/hp700/include/cpu.h Fri Jun 5 18:56:01 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.28 2008/09/06 09:45:57 skrll Exp $ */
+/* $NetBSD: cpu.h,v 1.28.10.1 2009/06/05 18:56:01 snj Exp $ */
/* $OpenBSD: cpu.h,v 1.20 2001/01/29 00:01:58 mickey Exp $ */
@@ -249,6 +249,7 @@
size_t *);
int copy_on_fault(void);
void lwp_trampoline(void);
+void setfunc_trampoline(void);
int cpu_dumpsize(void);
int cpu_dump(void);
#endif
Index: src/sys/arch/hppa/hppa/vm_machdep.c
diff -u src/sys/arch/hppa/hppa/vm_machdep.c:1.33 src/sys/arch/hppa/hppa/vm_machdep.c:1.33.6.1
--- src/sys/arch/hppa/hppa/vm_machdep.c:1.33 Fri Oct 17 12:35:12 2008
+++ src/sys/arch/hppa/hppa/vm_machdep.c Fri Jun 5 18:56:01 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.33 2008/10/17 12:35:12 skrll Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.33.6.1 2009/06/05 18:56:01 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 2008/10/17 12:35:12 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.33.6.1 2009/06/05 18:56:01 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -204,11 +204,11 @@
*/
osp = sp;
- /* lwp_trampoline's frame */
+ /* setfunc_trampoline's frame */
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;
