 @@ -1,14 +1,14 @@
-/*	$NetBSD: vm_machdep.c,v 1.98 2009/05/16 17:01:15 cegger Exp $ */
+/*	$NetBSD: vm_machdep.c,v 1.99 2009/05/27 04:08:06 mrg Exp $ */
 /*
  * Copyright (c) 1996
  *	The President and Fellows of Harvard College. All rights reserved.
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This software was developed by the Computer Systems Engineering group
  * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
  * contributed to Berkeley.
+ *
  * All advertising materials mentioning features or use of this software
  * must display the following acknowledgement:
 @@ -39,27 +39,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)vm_machdep.c	8.2 (Berkeley) 9/23/93
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.98 2009/05/16 17:01:15 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.99 2009/05/27 04:08:06 mrg Exp $");
 #include "opt_multiprocessor.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/user.h>
 #include <sys/core.h>
 #include <sys/malloc.h>
 #include <sys/buf.h>
 #include <sys/exec.h>
 #include <sys/vnode.h>
 #include <sys/simplelock.h>
 @@ -197,26 +197,30 @@ cpu_lwp_fork(struct lwp *l1, struct lwp
 	 * user registers and invalid stack pointers, to opcb.
 	 * We then copy the whole pcb to l2; when switch() selects l2
 	 * to run, it will run at the `lwp_trampoline' stub, rather
 	 * than returning at the copying code below.
+	 *
 	 * If process l1 has an FPU state, we must copy it.  If it is
 	 * the FPU user, we must save the FPU state first.
 	 */
 	if (l1 == curlwp) {
 		write_user_windows();
 		opcb->pcb_psr = getpsr();
+	}
 #ifdef DIAGNOSTIC
 	else if (l1 != &lwp0)	/* XXX is this valid? */
 		panic("cpu_lwp_fork: curlwp");
 #endif
 	memcpy((void *)npcb, (void *)opcb, sizeof(struct pcb));
 	if (l1->l_md.md_fpstate != NULL) {
 		struct cpu_info *cpi;
 		int s;
 		l2->l_md.md_fpstate = malloc(sizeof(struct fpstate),
 		    M_SUBPROC, M_WAITOK);
 		FPU_LOCK(s);
 		if ((cpi = l1->l_md.md_fpu) != NULL) {
 			if (cpi->fplwp != l1)
 				panic("FPU(%d): fplwp %p",
 @@ -261,34 +265,28 @@ cpu_lwp_fork(struct lwp *l1, struct lwp
 	 * note: lwp_trampoline() sets a fresh psr when returning
 	 * to user mode.
 	 */
 	/*tf2->tf_psr &= ~PSR_C;   -* success */
 	tf2->tf_pc = tf2->tf_npc;
 	tf2->tf_npc = tf2->tf_pc + 4;
 	/* Set return values in child mode */
 	tf2->tf_out[0] = 0;
 	tf2->tf_out[1] = 1;
 	/* Construct kernel frame to return to in cpu_switch() */
 	rp = (struct rwindow *)((u_int)npcb + TOPFRAMEOFF);
 	rp->rw_local[0] = (int)func;		/* Function to call */
 	rp->rw_local[1] = (int)arg;		/* and its argument */
 	rp->rw_local[2] = (int)l2;		/* the new LWP */
-	npcb->pcb_pc = (int)lwp_trampoline - 8;
+	cpu_setfunc(l2, func, arg);
 	npcb->pcb_sp = (int)rp;
 	npcb->pcb_psr &= ~PSR_CWP;	/* Run in window #0 */
 	npcb->pcb_wim = 1;		/* Fence at window #1 */
+}
 /*
  * Cleanup FPU state.
  */
 void
 cpu_lwp_free(struct lwp *l, int proc)
+{
 	struct fpstate *fs;
 	if ((fs = l->l_md.md_fpstate) != NULL) {
 		struct cpu_info *cpi;
 		int s;