From owner-p4-projects  Sun Jan 12 21: 0:44 2003
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C641D37B405; Sun, 12 Jan 2003 21:00:42 -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 5BBA837B401
	for <perforce@freebsd.org>; Sun, 12 Jan 2003 21:00:42 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 10A5743F3F
	for <perforce@freebsd.org>; Sun, 12 Jan 2003 21:00:42 -0800 (PST)
	(envelope-from marcel@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 h0D50ffh090940
	for <perforce@freebsd.org>; Sun, 12 Jan 2003 21:00:41 -0800 (PST)
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h0D50fCR090920
	for perforce@freebsd.org; Sun, 12 Jan 2003 21:00:41 -0800 (PST)
Date: Sun, 12 Jan 2003 21:00:41 -0800 (PST)
Message-Id: <200301130500.h0D50fCR090920@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
Subject: PERFORCE change 23663 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

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

Change 23663 by marcel@marcel_nfs on 2003/01/12 21:00:03

	Make the "wimp-out" code dependent on the non-existence of
	SPARSE_PHYSICAL_MEMORY. Enabling the option gives us another
	1GB of physical memory above 4GB on the pluto boxes, but
	causes a machine check when starting init(8). DMA bounce
	buffers come into play...

Affected files ...

.. //depot/projects/ia64/sys/ia64/ia64/machdep.c#59 edit

Differences ...

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

@@ -31,6 +31,7 @@
 #include "opt_ski.h"
 #include "opt_msgbuf.h"
 #include "opt_acpi.h"
+#include "opt_vmpage.h"
 
 #if !defined(SKI) && !defined(DEV_ACPI)
 #error "You need the SKI option and/or the acpi device"
@@ -574,6 +575,7 @@
 		if (mdp->Type != EfiConventionalMemory)
 			continue;
 
+#if !defined(SPARSE_PHYSICAL_MEMORY)
 		/*
 		 * Wimp out for now since we do not DTRT here with
 		 * pci bus mastering (no bounce buffering, for example).
@@ -588,6 +590,7 @@
 			    mdp->PhysicalStart + mdp->NumberOfPages * 4096);
 			continue;
 		}
+#endif
 
 		/*
 		 * We have a memory descriptor that describes conventional

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message