Sun Sep 23 22:31:39 2012 UTC ()
increase powerpc NKMEMPAGES_MAX_DEFAULT to 256MB.  remove the macppc
overrides that are now the same as the powerpc default.


(mrg)
diff -r1.19 -r1.20 src/sys/arch/macppc/include/param.h
diff -r1.27 -r1.28 src/sys/arch/powerpc/include/param.h
cvs diff -r1.19 -r1.20 src/sys/arch/macppc/include/param.h (expand / switch to unified diff)

--- src/sys/arch/macppc/include/param.h 2012/02/10 17:35:48 1.19
+++ src/sys/arch/macppc/include/param.h 2012/09/23 22:31:38 1.20
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: param.h,v 1.19 2012/02/10 17:35:48 para Exp $ */ 1/* $NetBSD: param.h,v 1.20 2012/09/23 22:31:38 mrg Exp $ */
2 2
3/*- 3/*-
4 * Copyright (C) 1995, 1996 Wolfgang Solfrank. 4 * Copyright (C) 1995, 1996 Wolfgang Solfrank.
5 * Copyright (C) 1995, 1996 TooLs GmbH. 5 * Copyright (C) 1995, 1996 TooLs GmbH.
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
11 * 1. Redistributions of source code must retain the above copyright 11 * 1. Redistributions of source code must retain the above copyright
12 * notice, this list of conditions and the following disclaimer. 12 * notice, this list of conditions and the following disclaimer.
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
@@ -36,26 +36,19 @@ @@ -36,26 +36,19 @@
36 */ 36 */
37#if defined(_KERNEL) && !defined(_MODULE) 37#if defined(_KERNEL) && !defined(_MODULE)
38 38
39#define MACHINE "macppc" 39#define MACHINE "macppc"
40#define KERNBASE 0x100000 40#define KERNBASE 0x100000
41 41
42/* 42/*
43 * 4KB isn't enough for a full boot message for a macppc system anymore 43 * 4KB isn't enough for a full boot message for a macppc system anymore
44 */ 44 */
45#ifndef MSGBUFSIZE 45#ifndef MSGBUFSIZE
46#define MSGBUFSIZE (3*NBPG) 46#define MSGBUFSIZE (3*NBPG)
47#endif 47#endif
48 48
49/* 
50 * Minimum and maximum sizes of the kernel malloc arena in PAGE_SIZE-sized 
51 * logical pages. 
52 */ 
53#define NKMEMPAGES_MIN_DEFAULT ((16 * 1024 * 1024) >> PAGE_SHIFT) 
54#define NKMEMPAGES_MAX_DEFAULT ((256 * 1024 * 1024) >> PAGE_SHIFT) 
55 
56#endif /* _KERNEL && !_MODULE */ 49#endif /* _KERNEL && !_MODULE */
57 50
58/* at this offset we mmap() the PCI IO range in display drivers */ 51/* at this offset we mmap() the PCI IO range in display drivers */
59#define PCI_MAGIC_IO_RANGE 0xf2000000 52#define PCI_MAGIC_IO_RANGE 0xf2000000
60 53
61#include <powerpc/param.h> 54#include <powerpc/param.h>
cvs diff -r1.27 -r1.28 src/sys/arch/powerpc/include/param.h (expand / switch to unified diff)

--- src/sys/arch/powerpc/include/param.h 2012/01/30 06:04:32 1.27
+++ src/sys/arch/powerpc/include/param.h 2012/09/23 22:31:39 1.28
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: param.h,v 1.27 2012/01/30 06:04:32 matt Exp $ */ 1/* $NetBSD: param.h,v 1.28 2012/09/23 22:31:39 mrg Exp $ */
2 2
3/*- 3/*-
4 * Copyright (C) 1995, 1996 Wolfgang Solfrank. 4 * Copyright (C) 1995, 1996 Wolfgang Solfrank.
5 * Copyright (C) 1995, 1996 TooLs GmbH. 5 * Copyright (C) 1995, 1996 TooLs GmbH.
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
11 * 1. Redistributions of source code must retain the above copyright 11 * 1. Redistributions of source code must retain the above copyright
12 * notice, this list of conditions and the following disclaimer. 12 * notice, this list of conditions and the following disclaimer.
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
@@ -100,21 +100,21 @@ @@ -100,21 +100,21 @@
100#ifndef MCLSHIFT 100#ifndef MCLSHIFT
101#define MCLSHIFT 11 /* convert bytes to m_buf clusters */ 101#define MCLSHIFT 11 /* convert bytes to m_buf clusters */
102#endif 102#endif
103#define MCLBYTES (1 << MCLSHIFT) /* size of a m_buf cluster */ 103#define MCLBYTES (1 << MCLSHIFT) /* size of a m_buf cluster */
104 104
105/* 105/*
106 * Minimum and maximum sizes of the kernel malloc arena in PAGE_SIZE-sized 106 * Minimum and maximum sizes of the kernel malloc arena in PAGE_SIZE-sized
107 * logical pages. 107 * logical pages.
108 */ 108 */
109#ifndef NKMEMPAGES_MIN_DEFAULT 109#ifndef NKMEMPAGES_MIN_DEFAULT
110#define NKMEMPAGES_MIN_DEFAULT ((16 * 1024 * 1024) >> PAGE_SHIFT) 110#define NKMEMPAGES_MIN_DEFAULT ((16 * 1024 * 1024) >> PAGE_SHIFT)
111#endif 111#endif
112#ifndef NKMEMPAGES_MAX_DEFAULT 112#ifndef NKMEMPAGES_MAX_DEFAULT
113#define NKMEMPAGES_MAX_DEFAULT ((128 * 1024 * 1024) >> PAGE_SHIFT) 113#define NKMEMPAGES_MAX_DEFAULT ((256 * 1024 * 1024) >> PAGE_SHIFT)
114#endif 114#endif
115 115
116#if defined(_KERNEL) && !defined(_LOCORE) 116#if defined(_KERNEL) && !defined(_LOCORE)
117#include <machine/cpu.h> 117#include <machine/cpu.h>
118#endif /* _KERNEL && !_LOCORE */ 118#endif /* _KERNEL && !_LOCORE */
119 119
120#endif /* _POWERPC_PARAM_H_ */ 120#endif /* _POWERPC_PARAM_H_ */