[src/trunk]: src/sys/arch Fix PR/44500 for hppa.

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6fc882507eef
branches:  trunk
changeset: 761774:6fc882507eef
user:      skrll <skrll%NetBSD.org@localhost>
date:      Mon Feb 07 12:19:35 2011 +0000

description:
Fix PR/44500 for hppa.

diffstat:

 sys/arch/hp700/hp700/locore.S   |  3 +--
 sys/arch/hp700/include/cpu.h    |  3 +--
 sys/arch/hppa/hppa/vm_machdep.c |  6 +++---
 3 files changed, 5 insertions(+), 7 deletions(-)

diffs (61 lines):

diff -r dab81e739394 -r 6fc882507eef sys/arch/hp700/hp700/locore.S
--- a/sys/arch/hp700/hp700/locore.S     Mon Feb 07 11:51:02 2011 +0000
+++ b/sys/arch/hp700/hp700/locore.S     Mon Feb 07 12:19:35 2011 +0000
@@ -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
diff -r dab81e739394 -r 6fc882507eef sys/arch/hp700/include/cpu.h
--- a/sys/arch/hp700/include/cpu.h      Mon Feb 07 11:51:02 2011 +0000
+++ b/sys/arch/hp700/include/cpu.h      Mon Feb 07 12:19:35 2011 +0000
@@ -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);
 
diff -r dab81e739394 -r 6fc882507eef sys/arch/hppa/hppa/vm_machdep.c
--- a/sys/arch/hppa/hppa/vm_machdep.c   Mon Feb 07 11:51:02 2011 +0000
+++ b/sys/arch/hppa/hppa/vm_machdep.c   Mon Feb 07 12:19:35 2011 +0000
@@ -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;