Module Name: src
Committed By: cegger
Date: Sat Jan 9 22:54:00 UTC 2010
Modified Files:
src/sys/arch/x86/x86: x86_machdep.c
Log Message:
TOPLIMIT for i386 PAE is 64GB.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/x86/x86/x86_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/x86_machdep.c
diff -u src/sys/arch/x86/x86/x86_machdep.c:1.37 src/sys/arch/x86/x86/x86_machdep.c:1.38
--- src/sys/arch/x86/x86/x86_machdep.c:1.37 Sun Nov 22 21:41:03 2009
+++ src/sys/arch/x86/x86/x86_machdep.c Sat Jan 9 22:54:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: x86_machdep.c,v 1.37 2009/11/22 21:41:03 bouyer Exp $ */
+/* $NetBSD: x86_machdep.c,v 1.38 2010/01/09 22:54:00 cegger Exp $ */
/*-
* Copyright (c) 2002, 2006, 2007 YAMAMOTO Takashi,
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.37 2009/11/22 21:41:03 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.38 2010/01/09 22:54:00 cegger Exp $");
#include "opt_modular.h"
@@ -367,9 +367,13 @@
int i;
#ifdef i386
-#define TOPLIMIT 0x100000000ULL
+#ifdef PAE
+#define TOPLIMIT 0x1000000000ULL /* 64GB */
#else
-#define TOPLIMIT 0x100000000000ULL
+#define TOPLIMIT 0x100000000ULL /* 4GB */
+#endif
+#else
+#define TOPLIMIT 0x100000000000ULL /* 16TB */
#endif
if (seg_end > TOPLIMIT) {
