Module Name: src
Committed By: riz
Date: Mon Oct 1 17:51:14 UTC 2012
Modified Files:
src/sys/arch/macppc/include [netbsd-6]: param.h
src/sys/arch/powerpc/include [netbsd-6]: param.h
Log Message:
Pull up following revision(s) (requested by mrg in ticket #575):
sys/arch/powerpc/include/param.h: revision 1.28
sys/arch/macppc/include/param.h: revision 1.20
increase powerpc NKMEMPAGES_MAX_DEFAULT to 256MB. remove the macppc
overrides that are now the same as the powerpc default.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.19.2.1 src/sys/arch/macppc/include/param.h
cvs rdiff -u -r1.27 -r1.27.2.1 src/sys/arch/powerpc/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/macppc/include/param.h
diff -u src/sys/arch/macppc/include/param.h:1.19 src/sys/arch/macppc/include/param.h:1.19.2.1
--- src/sys/arch/macppc/include/param.h:1.19 Fri Feb 10 17:35:48 2012
+++ src/sys/arch/macppc/include/param.h Mon Oct 1 17:51:14 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.19 2012/02/10 17:35:48 para Exp $ */
+/* $NetBSD: param.h,v 1.19.2.1 2012/10/01 17:51:14 riz Exp $ */
/*-
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -46,13 +46,6 @@
#define MSGBUFSIZE (3*NBPG)
#endif
-/*
- * Minimum and maximum sizes of the kernel malloc arena in PAGE_SIZE-sized
- * logical pages.
- */
-#define NKMEMPAGES_MIN_DEFAULT ((16 * 1024 * 1024) >> PAGE_SHIFT)
-#define NKMEMPAGES_MAX_DEFAULT ((256 * 1024 * 1024) >> PAGE_SHIFT)
-
#endif /* _KERNEL && !_MODULE */
/* at this offset we mmap() the PCI IO range in display drivers */
Index: src/sys/arch/powerpc/include/param.h
diff -u src/sys/arch/powerpc/include/param.h:1.27 src/sys/arch/powerpc/include/param.h:1.27.2.1
--- src/sys/arch/powerpc/include/param.h:1.27 Mon Jan 30 06:04:32 2012
+++ src/sys/arch/powerpc/include/param.h Mon Oct 1 17:51:14 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.27 2012/01/30 06:04:32 matt Exp $ */
+/* $NetBSD: param.h,v 1.27.2.1 2012/10/01 17:51:14 riz Exp $ */
/*-
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -110,7 +110,7 @@
#define NKMEMPAGES_MIN_DEFAULT ((16 * 1024 * 1024) >> PAGE_SHIFT)
#endif
#ifndef NKMEMPAGES_MAX_DEFAULT
-#define NKMEMPAGES_MAX_DEFAULT ((128 * 1024 * 1024) >> PAGE_SHIFT)
+#define NKMEMPAGES_MAX_DEFAULT ((256 * 1024 * 1024) >> PAGE_SHIFT)
#endif
#if defined(_KERNEL) && !defined(_LOCORE)
