From owner-p4-projects@FreeBSD.ORG  Tue Apr  8 01:51:47 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5FE2837B40E; Tue,  8 Apr 2003 01:51:46 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id DBF8137B401
	for <perforce@freebsd.org>; Tue,  8 Apr 2003 01:51:45 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 875F143F85
	for <perforce@freebsd.org>; Tue,  8 Apr 2003 01:51:45 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h388pj0U011866
	for <perforce@freebsd.org>; Tue, 8 Apr 2003 01:51:45 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h388pjGq011863
	for perforce@freebsd.org; Tue, 8 Apr 2003 01:51:45 -0700 (PDT)
Date: Tue, 8 Apr 2003 01:51:45 -0700 (PDT)
Message-Id: <200304080851.h388pjGq011863@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 28503 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 08 Apr 2003 08:51:47 -0000

http://perforce.freebsd.org/chv.cgi?CH=28503

Change 28503 by peter@peter_daintree on 2003/04/08 01:51:16

	point %cr3 to the pml4 or cpu_switch doesn't work too well

Affected files ...

.. //depot/projects/hammer/sys/x86_64/x86_64/vm_machdep.c#18 edit

Differences ...

==== //depot/projects/hammer/sys/x86_64/x86_64/vm_machdep.c#18 (text+ko) ====

@@ -134,11 +134,7 @@
 	 * Set registers for trampoline to user mode.  Leave space for the
 	 * return address on stack.  These are the kernel mode register values.
 	 */
-#ifdef PAE
-	pcb2->pcb_cr3 = vtophys(vmspace_pmap(p2->p_vmspace)->pm_pdpt);
-#else
-	pcb2->pcb_cr3 = vtophys(vmspace_pmap(p2->p_vmspace)->pm_pdir);
-#endif
+	pcb2->pcb_cr3 = vtophys(vmspace_pmap(p2->p_vmspace)->pm_pml4);
 	pcb2->pcb_r12 = (int)fork_return;	/* fork_trampoline argument */
 	pcb2->pcb_rbp = 0;
 	pcb2->pcb_rsp = (long)td2->td_frame - sizeof(void *);