From owner-p4-projects@FreeBSD.ORG  Wed Mar 24 16:10:12 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A114216A4D0; Wed, 24 Mar 2004 16:10:12 -0800 (PST)
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 77FDB16A4CE
	for <perforce@freebsd.org>; Wed, 24 Mar 2004 16:10:12 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6FA0843D3F
	for <perforce@freebsd.org>; Wed, 24 Mar 2004 16:10:12 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2P0ACGe022152
	for <perforce@freebsd.org>; Wed, 24 Mar 2004 16:10:12 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2P0ABpe022149
	for perforce@freebsd.org; Wed, 24 Mar 2004 16:10:11 -0800 (PST)
	(envelope-from peter@freebsd.org)
Date: Wed, 24 Mar 2004 16:10:11 -0800 (PST)
Message-Id: <200403250010.i2P0ABpe022149@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 49645 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: Thu, 25 Mar 2004 00:10:13 -0000

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

Change 49645 by peter@peter_daintree on 2004/03/24 16:09:58

	integrate -I -b i386_hammer

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#33 integrate
.. //depot/projects/hammer/sys/amd64/include/_types.h#9 integrate

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#33 (text+ko) ====

@@ -124,7 +124,8 @@
 	fpuexit(td1);
 
 	/* Point the pcb to the top of the stack */
-	pcb2 = (struct pcb *)(td2->td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1;
+	pcb2 = (struct pcb *)(td2->td_kstack +
+	    td2->td_kstack_pages * PAGE_SIZE) - 1;
 	td2->td_pcb = pcb2;
 
 	/* Copy p1's pcb */
@@ -247,8 +248,8 @@
 cpu_thread_setup(struct thread *td)
 {
 
-	td->td_pcb =
-	     (struct pcb *)(td->td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1;
+	td->td_pcb = (struct pcb *)(td->td_kstack +
+	    td->td_kstack_pages * PAGE_SIZE) - 1;
 	td->td_frame = (struct trapframe *)td->td_pcb - 1;
 }
 

==== //depot/projects/hammer/sys/amd64/include/_types.h#9 (text+ko) ====