diff options
Diffstat (limited to 'sys')
-rw-r--r-- | sys/arch/alpha/include/param.h | 12 | ||||
-rw-r--r-- | sys/arch/amd64/include/param.h | 7 | ||||
-rw-r--r-- | sys/arch/arm/include/param.h | 15 | ||||
-rw-r--r-- | sys/arch/hppa/include/param.h | 6 | ||||
-rw-r--r-- | sys/arch/i386/include/param.h | 7 | ||||
-rw-r--r-- | sys/arch/mvme88k/include/param.h | 9 | ||||
-rw-r--r-- | sys/arch/powerpc/include/param.h | 11 | ||||
-rw-r--r-- | sys/arch/sparc/include/param.h | 11 | ||||
-rw-r--r-- | sys/arch/sparc64/include/param.h | 11 | ||||
-rw-r--r-- | sys/arch/vax/include/param.h | 12 |
10 files changed, 20 insertions, 81 deletions
diff --git a/sys/arch/alpha/include/param.h b/sys/arch/alpha/include/param.h index efc930b88e5..5efd651be8b 100644 --- a/sys/arch/alpha/include/param.h +++ b/sys/arch/alpha/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.23 2003/06/02 23:27:43 millert Exp $ */ +/* $OpenBSD: param.h,v 1.24 2004/04/19 22:55:45 deraadt Exp $ */ /* $NetBSD: param.h,v 1.30 2000/06/09 16:03:04 thorpej Exp $ */ /* @@ -103,19 +103,13 @@ */ #define MSIZE 256 /* size of an mbuf */ #ifndef MCLSHIFT -# define MCLSHIFT 11 /* convert bytes to m_buf clusters */ +#define MCLSHIFT 11 /* convert bytes to m_buf clusters */ /* 2K cluster can hold Ether frame */ #endif /* MCLSHIFT */ #define MCLBYTES (1 << MCLSHIFT) /* size of a m_buf cluster */ #define MCLOFSET (MCLBYTES - 1) -#ifndef NMBCLUSTERS +#define NMBCLUSTERS 4096 /* map size, max cluster allocation */ -#ifdef GATEWAY -#define NMBCLUSTERS 1024 /* map size, max cluster allocation */ -#else -#define NMBCLUSTERS 512 /* map size, max cluster allocation */ -#endif -#endif /* * Minimum and maximum sizes of the kernel malloc arena in PAGE_SIZE-sized diff --git a/sys/arch/amd64/include/param.h b/sys/arch/amd64/include/param.h index aedd9111f8a..ea59b9e5273 100644 --- a/sys/arch/amd64/include/param.h +++ b/sys/arch/amd64/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.2 2004/02/27 17:41:25 deraadt Exp $ */ +/* $OpenBSD: param.h,v 1.3 2004/04/19 22:55:48 deraadt Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -114,10 +114,7 @@ #define MCLSHIFT 11 /* convert bytes to m_buf clusters */ #define MCLBYTES (1 << MCLSHIFT) /* size of a m_buf cluster */ #define MCLOFSET (MCLBYTES - 1) /* offset within a m_buf cluster */ - -#ifndef NMBCLUSTERS -#define NMBCLUSTERS 2048 /* map size, max cluster allocation */ -#endif +#define NMBCLUSTERS 6144 /* map size, max cluster allocation */ /* * Minimum and maximum sizes of the kernel malloc arena in PAGE_SIZE-sized diff --git a/sys/arch/arm/include/param.h b/sys/arch/arm/include/param.h index d5e3e304d2a..7f95b432d07 100644 --- a/sys/arch/arm/include/param.h +++ b/sys/arch/arm/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.2 2004/02/06 17:30:38 drahn Exp $ */ +/* $OpenBSD: param.h,v 1.3 2004/04/19 22:55:48 deraadt Exp $ */ /* $NetBSD: param.h,v 1.9 2002/03/24 03:37:23 thorpej Exp $ */ /* @@ -62,14 +62,6 @@ #define MSGBUFSIZE PAGE_SIZE /* default message buffer size */ #endif -#ifndef NMBCLUSTERS -#ifdef GATEWAY -#define NMBCLUSTERS 2048 /* map size, max cluster allocation */ -#else -#define NMBCLUSTERS 1024 /* map size, max cluster allocation */ -#endif -#endif - /* * Minimum and maximum sizes of the kernel malloc arena in PAGE_SIZE-sized * logical pages. @@ -196,13 +188,10 @@ void delay __P((unsigned)); * of the hardware page size. */ #define MSIZE 256 /* size of an mbuf */ - -#ifndef MCLSHIFT #define MCLSHIFT 11 /* convert bytes to m_buf clusters */ /* 2K cluster can hold Ether frame */ -#endif /* MCLSHIFT */ - #define MCLBYTES (1 << MCLSHIFT) /* size of a m_buf cluster */ +#define NMBCLUSTERS 4096 /* map size, max cluster allocation */ #define ovbcopy bcopy diff --git a/sys/arch/hppa/include/param.h b/sys/arch/hppa/include/param.h index 1fbfd7b7781..4562f474b58 100644 --- a/sys/arch/hppa/include/param.h +++ b/sys/arch/hppa/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.21 2003/04/16 07:26:07 mickey Exp $ */ +/* $OpenBSD: param.h,v 1.22 2004/04/19 22:55:49 deraadt Exp $ */ /* * Copyright (c) 1988-1994, The University of Utah and @@ -83,9 +83,7 @@ #define MCLSHIFT 11 #define MCLBYTES (1 << MCLSHIFT) /* large enough for ether MTU */ #define MCLOFSET (MCLBYTES - 1) -#ifndef NMBCLUSTERS -#define NMBCLUSTERS (2048) /* cl map size: 1MB */ -#endif +#define NMBCLUSTERS 4096 /* map size, max cluster allocation */ /* * Minimum and maximum sizes of the kernel malloc arena in PAGE_SIZE-sized diff --git a/sys/arch/i386/include/param.h b/sys/arch/i386/include/param.h index dbf25a51685..0d1dfb68fd9 100644 --- a/sys/arch/i386/include/param.h +++ b/sys/arch/i386/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.26 2004/01/14 01:45:50 miod Exp $ */ +/* $OpenBSD: param.h,v 1.27 2004/04/19 22:55:49 deraadt Exp $ */ /* $NetBSD: param.h,v 1.29 1996/03/04 05:04:26 cgd Exp $ */ /*- @@ -113,10 +113,7 @@ #define MCLSHIFT 11 /* convert bytes to m_buf clusters */ #define MCLBYTES (1 << MCLSHIFT) /* size of a m_buf cluster */ #define MCLOFSET (MCLBYTES - 1) /* offset within a m_buf cluster */ - -#ifndef NMBCLUSTERS -#define NMBCLUSTERS 2048 /* map size, max cluster allocation */ -#endif +#define NMBCLUSTERS 6144 /* map size, max cluster allocation */ /* * Minimum and maximum sizes of the kernel malloc arena in PAGE_SIZE-sized diff --git a/sys/arch/mvme88k/include/param.h b/sys/arch/mvme88k/include/param.h index a510c4a0695..7cc8ddbf041 100644 --- a/sys/arch/mvme88k/include/param.h +++ b/sys/arch/mvme88k/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.34 2004/01/19 17:18:13 miod Exp $ */ +/* $OpenBSD: param.h,v 1.35 2004/04/19 22:55:49 deraadt Exp $ */ /* * Copyright (c) 1999 Steve Murphree, Jr. * Copyright (c) 1988 University of Utah. @@ -111,14 +111,7 @@ #define MCLSHIFT 11 /* convert bytes to m_buf clusters */ #define MCLBYTES (1 << MCLSHIFT) /* size of a m_buf cluster */ #define MCLOFSET (MCLBYTES - 1) /* offset within a m_buf cluster */ - -#ifndef NMBCLUSTERS -#ifdef GATEWAY -#define NMBCLUSTERS 1024 /* map size, max cluster allocation */ -#else #define NMBCLUSTERS 512 /* map size, max cluster allocation */ -#endif -#endif /* * Minimum and maximum sizes of the kernel malloc arena in PAGE_SIZE-sized diff --git a/sys/arch/powerpc/include/param.h b/sys/arch/powerpc/include/param.h index 1ef45e2f761..dcde0032c8e 100644 --- a/sys/arch/powerpc/include/param.h +++ b/sys/arch/powerpc/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.22 2002/11/21 03:59:16 drahn Exp $ */ +/* $OpenBSD: param.h,v 1.23 2004/04/19 22:55:50 deraadt Exp $ */ /* $NetBSD: param.h,v 1.1 1996/09/30 16:34:28 ws Exp $ */ /*- @@ -79,14 +79,7 @@ #define MCLSHIFT 11 /* convert bytes to m_buf clusters */ #define MCLBYTES (1 << MCLSHIFT) /* size of a m_buf cluster */ #define MCLOFSET (MCLBYTES - 1) - -#ifndef NMBCLUSTERS -#ifdef GATEWAY -#define NMBCLUSTERS 2048 /* map size, max cluster allocation */ -#else -#define NMBCLUSTERS 1024 /* map size, max cluster allocation */ -#endif -#endif +#define NMBCLUSTERS 4096 /* map size, max cluster allocation */ /* * pages ("clicks") to disk blocks diff --git a/sys/arch/sparc/include/param.h b/sys/arch/sparc/include/param.h index aa1a6632e76..c214645ae74 100644 --- a/sys/arch/sparc/include/param.h +++ b/sys/arch/sparc/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.27 2003/06/02 23:27:54 millert Exp $ */ +/* $OpenBSD: param.h,v 1.28 2004/04/19 22:55:50 deraadt Exp $ */ /* $NetBSD: param.h,v 1.29 1997/03/10 22:50:37 pk Exp $ */ /* @@ -101,14 +101,7 @@ #define MCLSHIFT 11 /* log2(MCLBYTES) */ #define MCLBYTES (1 << MCLSHIFT) /* enough for whole Ethernet packet */ #define MCLOFSET (MCLBYTES - 1) - -#ifndef NMBCLUSTERS -#ifdef GATEWAY -#define NMBCLUSTERS 1024 /* map size, max cluster allocation */ -#else -#define NMBCLUSTERS 512 /* map size, max cluster allocation */ -#endif -#endif +#define NMBCLUSTERS 2048 /* map size, max cluster allocation */ #define MSGBUFSIZE 4096 /* cannot be changed without great pain */ diff --git a/sys/arch/sparc64/include/param.h b/sys/arch/sparc64/include/param.h index e6f6e1a7eca..3de7a4c6d42 100644 --- a/sys/arch/sparc64/include/param.h +++ b/sys/arch/sparc64/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.12 2003/06/02 23:27:56 millert Exp $ */ +/* $OpenBSD: param.h,v 1.13 2004/04/19 22:55:50 deraadt Exp $ */ /* $NetBSD: param.h,v 1.25 2001/05/30 12:28:51 mrg Exp $ */ /* @@ -182,14 +182,7 @@ extern int nbpg, pgofset, pgshift; #define MCLSHIFT 11 /* log2(MCLBYTES) */ #define MCLBYTES (1 << MCLSHIFT) /* enough for whole Ethernet packet */ #define MCLOFSET (MCLBYTES - 1) - -#ifndef NMBCLUSTERS -#ifdef GATEWAY -#define NMBCLUSTERS 2048 /* map size, max cluster allocation */ -#else -#define NMBCLUSTERS 1024 /* map size, max cluster allocation */ -#endif -#endif +#define NMBCLUSTERS 4096 /* map size, max cluster allocation */ #define MSGBUFSIZE NBPG diff --git a/sys/arch/vax/include/param.h b/sys/arch/vax/include/param.h index b232a1bb0f4..e95a3176de6 100644 --- a/sys/arch/vax/include/param.h +++ b/sys/arch/vax/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.25 2003/06/02 23:27:57 millert Exp $ */ +/* $OpenBSD: param.h,v 1.26 2004/04/19 22:55:51 deraadt Exp $ */ /* $NetBSD: param.h,v 1.39 1999/10/22 21:14:34 ragge Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -110,15 +110,7 @@ #endif /* MCLSHIFT */ #define MCLBYTES (1 << MCLSHIFT) /* size of an m_buf cluster */ #define MCLOFSET (MCLBYTES - 1) /* offset within an m_buf cluster */ - -#ifndef NMBCLUSTERS - -#ifdef GATEWAY -#define NMBCLUSTERS 512 /* map size, max cluster allocation */ -#else -#define NMBCLUSTERS 256 /* map size, max cluster allocation */ -#endif /* GATEWAY */ -#endif /* NMBCLUSTERS */ +#define NMBCLUSTERS 768 /* map size, max cluster allocation */ /* * Minimum and maximum sizes of the kernel malloc arena in PAGE_SIZE-sized |