[src/netbsd-6]: src/sys/arch/sparc64/include Pull up following revision(s) (r...

[bouyer <bouyer%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6b4be82c6915
branches:  netbsd-6
changeset: 773936:6b4be82c6915
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Sat Mar 17 17:54:22 2012 +0000

description:
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.

diffstat:

 sys/arch/sparc64/include/param.h |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (24 lines):

diff -r cbaf379f84f7 -r 6b4be82c6915 sys/arch/sparc64/include/param.h
--- a/sys/arch/sparc64/include/param.h  Sat Mar 17 17:53:01 2012 +0000
+++ b/sys/arch/sparc64/include/param.h  Sat Mar 17 17:54:22 2012 +0000
@@ -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 @@
 /*
  * 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