From owner-p4-projects@FreeBSD.ORG  Tue Jun 28 19:36:58 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 54A4E16A420; Tue, 28 Jun 2005 19:36:58 +0000 (GMT)
X-Original-To: perforce@freebsd.org
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 2846116A41C
	for <perforce@freebsd.org>; Tue, 28 Jun 2005 19:36:58 +0000 (GMT)
	(envelope-from ps@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 128A343D1D
	for <perforce@freebsd.org>; Tue, 28 Jun 2005 19:36:58 +0000 (GMT)
	(envelope-from ps@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5SJavGS097912
	for <perforce@freebsd.org>; Tue, 28 Jun 2005 19:36:57 GMT
	(envelope-from ps@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5SJavSf097909
	for perforce@freebsd.org; Tue, 28 Jun 2005 19:36:57 GMT
	(envelope-from ps@freebsd.org)
Date: Tue, 28 Jun 2005 19:36:57 GMT
Message-Id: <200506281936.j5SJavSf097909@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	ps@freebsd.org using -f
From: Paul Saab <ps@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 79100 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 28 Jun 2005 19:36:59 -0000

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

Change 79100 by ps@butter.corp on 2005/06/28 19:36:29

	Include page zero without having to do any fixup's in dump_machdep.c

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/dump_machdep.c#21 edit
.. //depot/projects/hammer/sys/amd64/amd64/machdep.c#134 edit
.. //depot/projects/hammer/sys/i386/i386/dump_machdep.c#8 edit
.. //depot/projects/hammer/sys/i386/i386/machdep.c#59 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/dump_machdep.c#21 (text+ko) ====

@@ -78,11 +78,6 @@
 			break;
 		dump_map[n].md_start = dump_avail[idx];
 		dump_map[n].md_size = dump_avail[idx + 1] - dump_avail[idx];
-		if (dump_map[n].md_start == PAGE_SIZE) {
-			/* Include page zero */
-			dump_map[n].md_start = 0;
-			dump_map[n].md_size += PAGE_SIZE;
-		}
 	}
 }
 

==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#134 (text+ko) ====

@@ -982,10 +982,9 @@
 	 */
 	physmap[0] = PAGE_SIZE;		/* mask off page 0 */
 	pa_indx = 0;
+	da_indx = 1;
 	phys_avail[pa_indx++] = physmap[0];
 	phys_avail[pa_indx] = physmap[0];
-	da_indx = 0;
-	dump_avail[da_indx++] = physmap[0];
 	dump_avail[da_indx] = physmap[0];
 	pte = CMAP1;
 

==== //depot/projects/hammer/sys/i386/i386/dump_machdep.c#8 (text+ko) ====

@@ -78,11 +78,6 @@
 			break;
 		dump_map[n].md_start = dump_avail[idx];
 		dump_map[n].md_size = dump_avail[idx + 1] - dump_avail[idx];
-		if (dump_map[n].md_start == PAGE_SIZE) {
-			/* Include page zero */
-			dump_map[n].md_start = 0;
-			dump_map[n].md_size += PAGE_SIZE;
-		}
 	}
 }
 

==== //depot/projects/hammer/sys/i386/i386/machdep.c#59 (text+ko) ====

@@ -1871,10 +1871,9 @@
 	 */
 	physmap[0] = PAGE_SIZE;		/* mask off page 0 */
 	pa_indx = 0;
-	da_indx = 0;
+	da_indx = 1;
 	phys_avail[pa_indx++] = physmap[0];
 	phys_avail[pa_indx] = physmap[0];
-	dump_avail[da_indx++] = physmap[0];
 	dump_avail[da_indx] = physmap[0];
 	pte = CMAP1;