Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/sun3/include Poor sun3 (but not sun3x) has only 31M...



details:   https://anonhg.NetBSD.org/src/rev/141b8a612f25
branches:  trunk
changeset: 780917:141b8a612f25
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sat Aug 11 14:35:33 2012 +0000

description:
Poor sun3 (but not sun3x) has only 31MB KVM address space,
so reduce NKMEMPAGES_MAX_DEFAULT from 64MB to 16MB.
Fixes "panic: ubc_init: failed to map ubc_object" on
TME emulating 3/120 with >16MB RAM.

Should be pulled up to netbsd-6.

diffstat:

 sys/arch/sun3/include/param.h   |   9 +--------
 sys/arch/sun3/include/param3.h  |  10 +++++++++-
 sys/arch/sun3/include/param3x.h |   9 ++++++++-
 3 files changed, 18 insertions(+), 10 deletions(-)

diffs (64 lines):

diff -r 42436e3bd9dc -r 141b8a612f25 sys/arch/sun3/include/param.h
--- a/sys/arch/sun3/include/param.h     Sat Aug 11 13:27:55 2012 +0000
+++ b/sys/arch/sun3/include/param.h     Sat Aug 11 14:35:33 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: param.h,v 1.60 2012/02/10 17:35:47 para Exp $  */
+/*     $NetBSD: param.h,v 1.61 2012/08/11 14:35:33 tsutsui Exp $       */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -75,13 +75,6 @@
 
 #include <m68k/param.h>
 
-/*
- * Minimum and maximum sizes of the kernel malloc arena in PAGE_SIZE-sized
- * logical pages.
- */
-#define        NKMEMPAGES_MIN_DEFAULT  ((8 * 1024 * 1024) >> PAGE_SHIFT)
-#define        NKMEMPAGES_MAX_DEFAULT  ((64 * 1024 * 1024) >> PAGE_SHIFT)
-
 #if defined(_KERNEL) && !defined(_LOCORE)
 
 #include <machine/intr.h>
diff -r 42436e3bd9dc -r 141b8a612f25 sys/arch/sun3/include/param3.h
--- a/sys/arch/sun3/include/param3.h    Sat Aug 11 13:27:55 2012 +0000
+++ b/sys/arch/sun3/include/param3.h    Sat Aug 11 14:35:33 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: param3.h,v 1.54 2011/02/08 20:20:25 rmind Exp $        */
+/*     $NetBSD: param3.h,v 1.55 2012/08/11 14:35:33 tsutsui Exp $      */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -43,3 +43,11 @@
 
 #define        KERNBASE3       0x0E000000      /* start of kernel virtual */
 #define        KERN_END3       0x0FE00000      /* end of kernel virtual */
+
+/*
+ * Minimum and maximum sizes of the kernel malloc arena in PAGE_SIZE-sized
+ * logical pages.
+ * Note maximum value can't be so large due to limited KVA space as above.
+ */
+#define        NKMEMPAGES_MIN_DEFAULT  ((8 * 1024 * 1024) >> PAGE_SHIFT)
+#define        NKMEMPAGES_MAX_DEFAULT  ((16 * 1024 * 1024) >> PAGE_SHIFT)
diff -r 42436e3bd9dc -r 141b8a612f25 sys/arch/sun3/include/param3x.h
--- a/sys/arch/sun3/include/param3x.h   Sat Aug 11 13:27:55 2012 +0000
+++ b/sys/arch/sun3/include/param3x.h   Sat Aug 11 14:35:33 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: param3x.h,v 1.17 2011/02/08 20:20:25 rmind Exp $       */
+/*     $NetBSD: param3x.h,v 1.18 2012/08/11 14:35:33 tsutsui Exp $     */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -43,3 +43,10 @@
 
 #define        KERNBASE3X      0xF8000000      /* start of kernel virtual */
 #define        KERN_END3X      0xFE000000      /* end of kernel virtual */
+
+/*
+ * Minimum and maximum sizes of the kernel malloc arena in PAGE_SIZE-sized
+ * logical pages.
+ */
+#define        NKMEMPAGES_MIN_DEFAULT  ((8 * 1024 * 1024) >> PAGE_SHIFT)
+#define        NKMEMPAGES_MAX_DEFAULT  ((64 * 1024 * 1024) >> PAGE_SHIFT)



Home | Main Index | Thread Index | Old Index