Module Name: src
Committed By: skrll
Date: Mon Feb 7 12:19:35 UTC 2011
Modified Files:
src/sys/arch/hp700/hp700: locore.S
src/sys/arch/hp700/include: cpu.h
src/sys/arch/hppa/hppa: vm_machdep.c
Log Message:
Fix PR/44500 for hppa.
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/hp700/hp700/locore.S
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/hp700/include/cpu.h
cvs rdiff -u -r1.46 -r1.47 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.54 src/sys/arch/hp700/hp700/locore.S:1.55
--- src/sys/arch/hp700/hp700/locore.S:1.54 Tue Feb 1 18:33:25 2011
+++ src/sys/arch/hp700/hp700/locore.S Mon Feb 7 12:19:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.54 2011/02/01 18:33:25 skrll Exp $ */
+/* $NetBSD: locore.S,v 1.55 2011/02/07 12:19:35 skrll Exp $ */
/* $OpenBSD: locore.S,v 1.158 2008/07/28 19:08:46 miod Exp $ */
/*
@@ -1101,7 +1101,6 @@
.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.65 src/sys/arch/hp700/include/cpu.h:1.66
--- src/sys/arch/hp700/include/cpu.h:1.65 Mon Jan 31 18:21:33 2011
+++ src/sys/arch/hp700/include/cpu.h Mon Feb 7 12:19:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.65 2011/01/31 18:21:33 skrll Exp $ */
+/* $NetBSD: cpu.h,v 1.66 2011/02/07 12:19:35 skrll Exp $ */
/* $OpenBSD: cpu.h,v 1.55 2008/07/23 17:39:35 kettenis Exp $ */
@@ -379,7 +379,6 @@
size_t *);
int copy_on_fault(void);
void lwp_trampoline(void);
-void setfunc_trampoline(void);
int cpu_dumpsize(void);
int cpu_dump(void);
Index: src/sys/arch/hppa/hppa/vm_machdep.c
diff -u src/sys/arch/hppa/hppa/vm_machdep.c:1.46 src/sys/arch/hppa/hppa/vm_machdep.c:1.47
--- src/sys/arch/hppa/hppa/vm_machdep.c:1.46 Sun Jan 23 09:44:59 2011
+++ src/sys/arch/hppa/hppa/vm_machdep.c Mon Feb 7 12:19:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.46 2011/01/23 09:44:59 skrll Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.47 2011/02/07 12:19:35 skrll Exp $ */
/* $OpenBSD: vm_machdep.c,v 1.64 2008/09/30 18:54:26 miod Exp $ */
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.46 2011/01/23 09:44:59 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.47 2011/02/07 12:19:35 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -205,7 +205,7 @@
*(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;
