Module Name: src
Committed By: bouyer
Date: Sat Mar 17 17:54:22 UTC 2012
Modified Files:
src/sys/arch/sparc64/include [netbsd-6]: param.h
Log Message:
Pull up following revision(s) (requested by martin in ticket #123):
sys/arch/sparc64/include/param.h: revision 1.49
sys/arch/sparc64/include/param.h: revision 1.50
Restrict NKMEMPAGES to 2.5GB, otherwise we will run out of space in the
kernel_map on machines with 8GB (or more) main memory.
XXX: Moving KERNBASE/KERNEND is a better long term solution, but this allows
those machines to boot now.
Fix previous, which causes an integer overflow error in uvm_km.c on
32-bit kernels.
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.48.2.1 src/sys/arch/sparc64/include/param.h
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/sparc64/include/param.h
diff -u src/sys/arch/sparc64/include/param.h:1.48 src/sys/arch/sparc64/include/param.h:1.48.2.1
--- src/sys/arch/sparc64/include/param.h:1.48 Sat Feb 4 17:56:16 2012
+++ src/sys/arch/sparc64/include/param.h Sat Mar 17 17:54:22 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.48 2012/02/04 17:56:16 para Exp $ */
+/* $NetBSD: param.h,v 1.48.2.1 2012/03/17 17:54:22 bouyer Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -195,10 +195,12 @@ extern int nbpg, pgofset, pgshift;
/*
* Minimum size of the kernel kmem_arena in PAGE_SIZE-sized
* logical pages.
- * No enforced maximum on sparc64.
+ * Maximum of 2.5GB on sparc64 (it must fit into KERNEND - KERNBASE, and also
+ * leave space in the kernel_map for other allocations).
*/
#define NKMEMPAGES_MIN_DEFAULT ((64 * 1024 * 1024) >> PAGE_SHIFT)
-#define NKMEMPAGES_MAX_UNLIMITED 1
+#undef NKMEMPAGES_MAX_UNLIMITED
+#define NKMEMPAGES_MAX_DEFAULT ((2048UL * 1024 * 1024) >> PAGE_SHIFT)
#ifdef _KERNEL
#ifndef _LOCORE
