Module Name: src
Committed By: tsutsui
Date: Sat Aug 11 14:35:33 UTC 2012
Modified Files:
src/sys/arch/sun3/include: param.h param3.h param3x.h
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/sun3/include/param.h
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/sun3/include/param3.h
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/sun3/include/param3x.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/sun3/include/param.h
diff -u src/sys/arch/sun3/include/param.h:1.60 src/sys/arch/sun3/include/param.h:1.61
--- src/sys/arch/sun3/include/param.h:1.60 Fri Feb 10 17:35:47 2012
+++ src/sys/arch/sun3/include/param.h Sat Aug 11 14:35:33 2012
@@ -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>
Index: src/sys/arch/sun3/include/param3.h
diff -u src/sys/arch/sun3/include/param3.h:1.54 src/sys/arch/sun3/include/param3.h:1.55
--- src/sys/arch/sun3/include/param3.h:1.54 Tue Feb 8 20:20:25 2011
+++ src/sys/arch/sun3/include/param3.h Sat Aug 11 14:35:33 2012
@@ -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)
Index: src/sys/arch/sun3/include/param3x.h
diff -u src/sys/arch/sun3/include/param3x.h:1.17 src/sys/arch/sun3/include/param3x.h:1.18
--- src/sys/arch/sun3/include/param3x.h:1.17 Tue Feb 8 20:20:25 2011
+++ src/sys/arch/sun3/include/param3x.h Sat Aug 11 14:35:33 2012
@@ -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)
