From fed18f54cdcab5de9ae04d949a14bea8a68d9477 Mon Sep 17 00:00:00 2001
From: jlemon <jlemon@FreeBSD.org>
Date: Thu, 24 Jun 1999 20:47:11 +0000
Subject: Explicitly ignore any memory > 2GB, we don't support it yet.

---
 sys/amd64/amd64/machdep.c | 8 +++++++-
 sys/i386/i386/machdep.c   | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index 7cc1e5f..54f3359 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.341 1999/06/13 19:20:25 alc Exp $
+ *	$Id: machdep.c,v 1.342 1999/06/18 14:32:14 bde Exp $
  */
 
 #include "apm.h"
@@ -1230,6 +1230,12 @@ getmemsize(int first)
 		if (smap->length == 0)
 			goto next_run;
 
+		if (smap->base > 0xffffffff) {
+			printf("%dK of memory above 2GB ignored\n",
+			    (u_int32_t)(smap->length / 1024));
+			goto next_run;
+		}
+
 		for (i = 0; i <= physmap_idx; i += 2) {
 			if (smap->base < physmap[i + 1]) {
 				if (boothowto & RB_VERBOSE)
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index 7cc1e5f..54f3359 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.341 1999/06/13 19:20:25 alc Exp $
+ *	$Id: machdep.c,v 1.342 1999/06/18 14:32:14 bde Exp $
  */
 
 #include "apm.h"
@@ -1230,6 +1230,12 @@ getmemsize(int first)
 		if (smap->length == 0)
 			goto next_run;
 
+		if (smap->base > 0xffffffff) {
+			printf("%dK of memory above 2GB ignored\n",
+			    (u_int32_t)(smap->length / 1024));
+			goto next_run;
+		}
+
 		for (i = 0; i <= physmap_idx; i += 2) {
 			if (smap->base < physmap[i + 1]) {
 				if (boothowto & RB_VERBOSE)
-- 
cgit v1.1