Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove separate mb_map. The nmbclusters is computed at boot time based

Browse Source 
on the amount of physical memory and limited by NMBCLUSTERS if present.
Architectures without direct mapping also limit it based on the kmem_map
size, which is used as backing store. On i386 and ARM, the maximum KVA
used for mbuf clusters is limited to 64MB by default.

The old default limits and limits based on GATEWAY have been removed.
key_registered_sb_max is hard-wired to a value derived from 2048
clusters.
This commit is contained in:
joerg 2010-02-08 19:02:25 +00:00
parent 9554bb1e78
commit d621e29eca
89 changed files with 197 additions and 546 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/arch/acorn26/acorn26/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.32 2009/11/21 20:32:17 rmind Exp $ */
/* $NetBSD: machdep.c,v 1.33 2010/02/08 19:02:25 joerg Exp $ */
/*-
* Copyright (c) 1998 Ben Harris
@ -32,7 +32,7 @@
#include <sys/param.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.32 2009/11/21 20:32:17 rmind Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.33 2010/02/08 19:02:25 joerg Exp $");
#include <sys/buf.h>
#include <sys/kernel.h>
@ -57,7 +57,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.32 2009/11/21 20:32:17 rmind Exp $");
char cpu_model[] = "Archimedes";
struct vm_map *phys_map = NULL;
struct vm_map *mb_map = NULL; /* and ever more shall be so */
int waittime = -1;

14
sys/arch/acorn26/include/param.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: param.h,v 1.3 2009/01/14 23:14:48 bjh21 Exp $ */
/* $NetBSD: param.h,v 1.4 2010/02/08 19:02:25 joerg Exp $ */
/*
* Copyright (c) 1994,1995 Mark Brinicombe.
@ -58,18 +58,6 @@
#define MSGBUFSIZE NBPG /* default message buffer size */
#endif
#ifndef NMBCLUSTERS
#if defined(_KERNEL_OPT)
#include "opt_gateway.h"
#endif
#ifdef GATEWAY
#define NMBCLUSTERS 512 /* map size, max cluster allocation */
#else
#define NMBCLUSTERS 256 /* map size, max cluster allocation */
#endif
#endif
/*
* Defaults for lower- and upper-bounds for the kmem_map page count.
* Can be overridden by kernel config options.

5
sys/arch/algor/algor/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.44 2009/12/14 00:45:59 matt Exp $ */
/* $NetBSD: machdep.c,v 1.45 2010/02/08 19:02:25 joerg Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -106,7 +106,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.44 2009/12/14 00:45:59 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.45 2010/02/08 19:02:25 joerg Exp $");
#include "opt_algor_p4032.h"
#include "opt_algor_p5064.h"
@ -187,7 +187,6 @@ struct p6032_config p6032_configuration;
struct cpu_info cpu_info_store;
/* Maps for VM objects. */
struct vm_map *mb_map = NULL;
struct vm_map *phys_map = NULL;
int physmem; /* # pages of physical memory */

5
sys/arch/alpha/alpha/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.325 2009/12/10 14:13:48 matt Exp $ */
/* $NetBSD: machdep.c,v 1.326 2010/02/08 19:02:25 joerg Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@ -68,7 +68,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.325 2009/12/10 14:13:48 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.326 2010/02/08 19:02:25 joerg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -137,7 +137,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.325 2009/12/10 14:13:48 matt Exp $");
#include "ksyms.h"
struct vm_map *mb_map = NULL;
struct vm_map *phys_map = NULL;
void *msgbufaddr;

14
sys/arch/alpha/include/param.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: param.h,v 1.36 2006/08/28 13:43:35 yamt Exp $ */
/* $NetBSD: param.h,v 1.37 2010/02/08 19:02:25 joerg Exp $ */
/*
* Copyright (c) 1992, 1993
@ -142,18 +142,6 @@
#define MCLBYTES (1 << MCLSHIFT) /* size of a m_buf cluster */
#ifndef NMBCLUSTERS
#if defined(_KERNEL_OPT)
#include "opt_gateway.h"
#endif
#ifdef GATEWAY
#define NMBCLUSTERS 4096 /* map size, max cluster allocation */
#else
#define NMBCLUSTERS 2048 /* map size, max cluster allocation */
#endif
#endif
/*
* Minimum and maximum sizes of the kernel malloc arena in PAGE_SIZE-sized
* logical pages.

11
sys/arch/amd64/amd64/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.141 2009/12/31 01:11:28 jym Exp $ */
/* $NetBSD: machdep.c,v 1.142 2010/02/08 19:02:26 joerg Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000, 2006, 2007, 2008
@ -107,7 +107,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.141 2009/12/31 01:11:28 jym Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.142 2010/02/08 19:02:26 joerg Exp $");
/* #define XENDEBUG_LOW */
@ -256,7 +256,6 @@ static struct vm_map_kernel module_map_store;
extern struct vm_map *module_map;
vaddr_t kern_end;
struct vm_map *mb_map = NULL;
struct vm_map *phys_map = NULL;
extern paddr_t avail_start, avail_end;
@ -341,12 +340,6 @@ cpu_startup(void)
phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_PHYS_SIZE, 0, false, NULL);
/*
* Finally, allocate mbuf cluster submap.
*/
mb_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
nmbclusters * mclbytes, VM_MAP_INTRSAFE, false, NULL);
uvm_map_setup_kernel(&module_map_store, module_start, module_end, 0);
module_map_store.vmk_map.pmap = pmap_kernel();
module_map = &module_map_store.vmk_map;

14
sys/arch/amd64/include/param.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: param.h,v 1.12 2009/11/11 23:59:36 haad Exp $ */
/* $NetBSD: param.h,v 1.13 2010/02/08 19:02:26 joerg Exp $ */
#ifdef __x86_64__
@ -86,18 +86,6 @@
#define MCLBYTES (1 << MCLSHIFT) /* size of a m_buf cluster */
#ifndef NMBCLUSTERS
#if defined(_KERNEL_OPT)
#include "opt_gateway.h"
#endif
#ifdef GATEWAY
#define NMBCLUSTERS 4096 /* map size, max cluster allocation */
#else
#define NMBCLUSTERS 2048 /* map size, max cluster allocation */
#endif
#endif
#ifndef NFS_RSIZE
#define NFS_RSIZE 32768
#endif

12
sys/arch/amiga/amiga/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.224 2009/12/10 14:13:49 matt Exp $ */
/* $NetBSD: machdep.c,v 1.225 2010/02/08 19:02:26 joerg Exp $ */
/*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@ -86,7 +86,7 @@
#include "opt_panicbutton.h"
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.224 2009/12/10 14:13:49 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.225 2010/02/08 19:02:26 joerg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -163,7 +163,6 @@ void fdintr(int);
volatile unsigned int interrupt_depth = 0;
struct vm_map *mb_map = NULL;
struct vm_map *phys_map = NULL;
void * msgbufaddr;
@ -291,13 +290,6 @@ cpu_startup(void)
phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_PHYS_SIZE, 0, false, NULL);
/*
* Finally, allocate mbuf cluster submap.
*/
mb_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
nmbclusters * mclbytes, VM_MAP_INTRSAFE,
false, NULL);
#ifdef DEBUG
pmapdebug = opmapdebug;
#endif

5
sys/arch/arc/arc/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.119 2009/12/16 23:19:06 matt Exp $ */
/* $NetBSD: machdep.c,v 1.120 2010/02/08 19:02:26 joerg Exp $ */
/* $OpenBSD: machdep.c,v 1.36 1999/05/22 21:22:19 weingart Exp $ */
/*
@ -78,7 +78,7 @@
/* from: Utah Hdr: machdep.c 1.63 91/04/24 */
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.119 2009/12/16 23:19:06 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.120 2010/02/08 19:02:26 joerg Exp $");
#include "fs_mfs.h"
#include "opt_ddb.h"
@ -167,7 +167,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.119 2009/12/16 23:19:06 matt Exp $");
struct cpu_info cpu_info_store;
/* maps for VM objects */
struct vm_map *mb_map = NULL;
struct vm_map *phys_map = NULL;
int maxmem; /* max memory per process */

14
sys/arch/arc/include/param.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: param.h,v 1.25 2009/08/13 05:15:08 matt Exp $ */
/* $NetBSD: param.h,v 1.26 2010/02/08 19:02:26 joerg Exp $ */
/* $OpenBSD: param.h,v 1.9 1997/04/30 09:54:15 niklas Exp $ */
/*
@ -132,18 +132,6 @@
#define MCLBYTES (1 << MCLSHIFT) /* size of a m_buf cluster */
#ifndef NMBCLUSTERS
#if defined(_KERNEL_OPT)
#include "opt_gateway.h"
#endif
#ifdef GATEWAY
#define NMBCLUSTERS 2048 /* map size, max cluster allocation */
#else
#define NMBCLUSTERS 1024 /* map size, max cluster allocation */
#endif
#endif
/* bytes to disk blocks */
#define btodb(x) ((x) >> DEV_BSHIFT)
#define dbtob(x) ((x) << DEV_BSHIFT)

12
sys/arch/arm/arm32/arm32_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: arm32_machdep.c,v 1.72 2010/01/18 23:04:30 jmmv Exp $ */
/* $NetBSD: arm32_machdep.c,v 1.73 2010/02/08 19:02:26 joerg Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: arm32_machdep.c,v 1.72 2010/01/18 23:04:30 jmmv Exp $");
__KERNEL_RCSID(0, "$NetBSD: arm32_machdep.c,v 1.73 2010/02/08 19:02:26 joerg Exp $");
#include "opt_modular.h"
#include "opt_md.h"
@ -71,7 +71,6 @@ __KERNEL_RCSID(0, "$NetBSD: arm32_machdep.c,v 1.72 2010/01/18 23:04:30 jmmv Exp
#include "md.h"
struct vm_map *mb_map = NULL;
struct vm_map *phys_map = NULL;
#if NMD > 0 && defined(MEMORY_DISK_HOOKS) && !defined(MEMORY_DISK_ROOT_SIZE)
@ -244,13 +243,6 @@ cpu_startup(void)
phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_PHYS_SIZE, 0, false, NULL);
/*
* Finally, allocate mbuf cluster submap.
*/
mb_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
nmbclusters * mclbytes, VM_MAP_INTRSAFE,
false, NULL);
format_bytes(pbuf, sizeof(pbuf), ptoa(uvmexp.free));
printf("avail memory = %s\n", pbuf);

14
sys/arch/arm/include/arm32/param.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: param.h,v 1.14 2009/03/14 14:45:55 dsl Exp $ */
/* $NetBSD: param.h,v 1.15 2010/02/08 19:02:26 joerg Exp $ */
/*
* Copyright (c) 1994,1995 Mark Brinicombe.
@ -60,18 +60,6 @@
#define MSGBUFSIZE NBPG /* default message buffer size */
#endif
#ifndef NMBCLUSTERS
#if defined(_KERNEL_OPT)
#include "opt_gateway.h"
#endif
#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.

11
sys/arch/atari/atari/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.164 2009/12/10 14:13:49 matt Exp $ */
/* $NetBSD: machdep.c,v 1.165 2010/02/08 19:02:26 joerg Exp $ */
/*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.164 2009/12/10 14:13:49 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.165 2010/02/08 19:02:26 joerg Exp $");
#include "opt_ddb.h"
#include "opt_compat_netbsd.h"
@ -140,7 +140,6 @@ void straytrap(int, u_short);
void nmihandler(void);
#endif
struct vm_map *mb_map = NULL;
struct vm_map *phys_map = NULL;
void * msgbufaddr;
@ -258,12 +257,6 @@ cpu_startup(void)
phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_PHYS_SIZE, 0, false, NULL);
/*
* Finally, allocate mbuf cluster submap.
*/
mb_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
nmbclusters * mclbytes, VM_MAP_INTRSAFE, false, NULL);
#ifdef DEBUG
pmapdebug = opmapdebug;
#endif

12
sys/arch/cesfic/cesfic/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.53 2009/12/10 14:13:49 matt Exp $ */
/* $NetBSD: machdep.c,v 1.54 2010/02/08 19:02:27 joerg Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.53 2009/12/10 14:13:49 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.54 2010/02/08 19:02:27 joerg Exp $");
#include "opt_bufcache.h"
#include "opt_ddb.h"
@ -147,7 +147,6 @@ char machine[] = MACHINE; /* CPU "architecture" */
/* Our exported CPU info; we can have only one. */
struct cpu_info cpu_info_store;
struct vm_map *mb_map = NULL;
struct vm_map *phys_map = NULL;
/*
@ -308,13 +307,6 @@ cpu_startup(void)
phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_PHYS_SIZE, 0, false, NULL);
/*
* Finally, allocate mbuf cluster submap.
*/
mb_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
nmbclusters * mclbytes, VM_MAP_INTRSAFE,
false, NULL);
#ifdef DEBUG
pmapdebug = opmapdebug;
#endif

4
sys/arch/cesfic/conf/GENERIC
View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.52 2009/01/24 05:06:05 mrg Exp $
# $NetBSD: GENERIC,v 1.53 2010/02/08 19:02:27 joerg Exp $
#
# GENERIC machine description file
#
@ -83,7 +83,7 @@ options FIFO # POSIX fifo support (in all filesystems)
# Networking options
options INET # Internet protocols
#options GATEWAY # IP forwarding + larger mb_map
#options GATEWAY # IP forwarding
#options MROUTING # Multicast routing
#options PIM # Protocol Independent Multicast
#options PFIL_HOOKS # packet filter hooks

5
sys/arch/cobalt/cobalt/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.108 2009/12/18 23:22:28 matt Exp $ */
/* $NetBSD: machdep.c,v 1.109 2010/02/08 19:02:27 joerg Exp $ */
/*-
* Copyright (c) 2006 Izumi Tsutsui. All rights reserved.
@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.108 2009/12/18 23:22:28 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.109 2010/02/08 19:02:27 joerg Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@ -97,7 +97,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.108 2009/12/18 23:22:28 matt Exp $");
struct cpu_info cpu_info_store;
/* Maps for VM objects. */
struct vm_map *mb_map = NULL;
struct vm_map *phys_map = NULL;
int physmem; /* Total physical memory */

3
sys/arch/evbarm/conf/CP3100
View File

@ -1,4 +1,4 @@
# $NetBSD: CP3100,v 1.15 2009/12/05 20:11:11 pooka Exp $
# $NetBSD: CP3100,v 1.16 2010/02/08 19:02:27 joerg Exp $
#
# CP3100 -- Certance CP3100 Kernel
#
@ -15,7 +15,6 @@ maxusers 32
options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT
options NTP # NTP phase/frequency locked loop
#options NMBCLUSTERS=1024
# CPU options

5
sys/arch/evbmips/adm5120/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.15 2010/01/22 08:56:05 martin Exp $ */
/* $NetBSD: machdep.c,v 1.16 2010/02/08 19:02:27 joerg Exp $ */
/*-
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@ -107,7 +107,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.15 2010/01/22 08:56:05 martin Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.16 2010/02/08 19:02:27 joerg Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@ -164,7 +164,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.15 2010/01/22 08:56:05 martin Exp $");
struct cpu_info cpu_info_store;
/* Maps for VM objects. */
struct vm_map *mb_map = NULL;
struct vm_map *phys_map = NULL;
int maxmem; /* max memory per process */

5
sys/arch/evbmips/alchemy/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.46 2009/12/16 08:26:14 matt Exp $ */
/* $NetBSD: machdep.c,v 1.47 2010/02/08 19:02:27 joerg Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@ -107,7 +107,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.46 2009/12/16 08:26:14 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.47 2010/02/08 19:02:27 joerg Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@ -166,7 +166,6 @@ int aucomcnrate = 0;
struct cpu_info cpu_info_store;
/* Maps for VM objects. */
struct vm_map *mb_map = NULL;
struct vm_map *phys_map = NULL;
int maxmem; /* max memory per process */

5
sys/arch/evbmips/atheros/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.21 2009/12/14 00:46:01 matt Exp $ */
/* $NetBSD: machdep.c,v 1.22 2010/02/08 19:02:27 joerg Exp $ */
/*
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
@ -147,7 +147,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.21 2009/12/14 00:46:01 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.22 2010/02/08 19:02:27 joerg Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@ -187,7 +187,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.21 2009/12/14 00:46:01 matt Exp $");
struct cpu_info cpu_info_store;
/* Maps for VM objects. */
struct vm_map *mb_map = NULL;
struct vm_map *phys_map = NULL;
int maxmem; /* max memory per process */

5
sys/arch/evbmips/gdium/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.10 2009/11/27 03:23:08 rmind Exp $ */
/* $NetBSD: machdep.c,v 1.11 2010/02/08 19:02:27 joerg Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@ -112,7 +112,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.10 2009/11/27 03:23:08 rmind Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.11 2010/02/08 19:02:27 joerg Exp $");
#include "opt_ddb.h"
#include "opt_execfmt.h"
@ -168,7 +168,6 @@ extern char cpu_model[];
struct cpu_info cpu_info_store;
/* Maps for VM objects. */
struct vm_map *mb_map = NULL;
struct vm_map *phys_map = NULL;
int netboot; /* Are we netbooting? */

5
sys/arch/evbmips/malta/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.37 2009/12/14 00:46:02 matt Exp $ */
/* $NetBSD: machdep.c,v 1.38 2010/02/08 19:02:27 joerg Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@ -112,7 +112,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.37 2009/12/14 00:46:02 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.38 2010/02/08 19:02:27 joerg Exp $");
#include "opt_ddb.h"
#include "opt_execfmt.h"
@ -169,7 +169,6 @@ extern char cpu_model[];
struct cpu_info cpu_info_store;
/* Maps for VM objects. */
struct vm_map *mb_map = NULL;
struct vm_map *phys_map = NULL;
int physmem; /* Total physical memory */

5
sys/arch/evbmips/rmixl/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.3 2009/12/20 04:11:37 rmind Exp $ */
/* $NetBSD: machdep.c,v 1.4 2010/02/08 19:02:27 joerg Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@ -112,7 +112,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.3 2009/12/20 04:11:37 rmind Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.4 2010/02/08 19:02:27 joerg Exp $");
#include "opt_ddb.h"
#include "opt_com.h"
@ -230,7 +230,6 @@ extern char cpu_model[];
struct cpu_info cpu_info_store;
/* Maps for VM objects. */
struct vm_map *mb_map = NULL;
struct vm_map *phys_map = NULL;
int physmem; /* Total physical memory */

3
sys/arch/evbppc/conf/EV64260
View File

@ -1,4 +1,4 @@
# $NetBSD: EV64260,v 1.41 2009/12/24 09:26:43 kiyohara Exp $
# $NetBSD: EV64260,v 1.42 2010/02/08 19:02:28 joerg Exp $
#
# MVP -- Motorola's Multiprocessing Verification Platform
#
@ -127,7 +127,6 @@ options INET # IP + ICMP + TCP + UDP
#options IPFILTER_LOG # ipmon(8) log support
#options IPFILTER_LOOKUP # ippool(8) support
#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG
#options NMBCLUSTERS=1024
# These options enable verbose messages for several subsystems.
# Warning, these may compile large string tables into the kernel!

3
sys/arch/evbppc/conf/OPENBLOCKS200
View File

@ -1,4 +1,4 @@
# $NetBSD: OPENBLOCKS200,v 1.25 2009/12/24 09:29:36 kiyohara Exp $
# $NetBSD: OPENBLOCKS200,v 1.26 2010/02/08 19:02:28 joerg Exp $
#
# GENERIC -- everything that's currently supported
#
@ -111,7 +111,6 @@ options PFIL_HOOKS # pfil(9) packet filter hooks
options IPFILTER_LOG # ipmon(8) log support
options IPFILTER_LOOKUP # ippool(8) support
#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG
options NMBCLUSTERS=1024
# These options enable verbose messages for several subsystems.
# Warning, these may compile large string tables into the kernel!

3
sys/arch/evbppc/conf/PMPPC
View File

@ -1,4 +1,4 @@
# $NetBSD: PMPPC,v 1.11 2009/12/24 09:26:43 kiyohara Exp $
# $NetBSD: PMPPC,v 1.12 2010/02/08 19:02:28 joerg Exp $
#
# PMPPC
#
@ -107,7 +107,6 @@ options PIM # Protocol Independent Multicast
#options IPFILTER_LOG # ipmon(8) log support
#options IPFILTER_LOOKUP # ippool(8) support
#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG
#options NMBCLUSTERS=1024
# These options enable verbose messages for several subsystems.
# Warning, these may compile large string tables into the kernel!

3
sys/arch/evbppc/conf/VIRTEX_DFC
View File

@ -1,4 +1,4 @@
# $NetBSD: VIRTEX_DFC,v 1.8 2009/12/24 09:26:43 kiyohara Exp $
# $NetBSD: VIRTEX_DFC,v 1.9 2010/02/08 19:02:28 joerg Exp $
#
# VIRTEX_DFC
#
@ -126,7 +126,6 @@ options PPP_FILTER # Active filter support for PPP (requires bpf)
options PFIL_HOOKS # pfil(9) packet filter hooks
options IPFILTER_LOG # ipmon(8) log support
#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG
options NMBCLUSTERS=4096
# These options enable verbose messages for several subsystems.
# Warning, these may compile large string tables into the kernel!

3
sys/arch/evbppc/conf/VIRTEX_GSRD1
View File

@ -1,4 +1,4 @@
# $NetBSD: VIRTEX_GSRD1,v 1.8 2009/12/24 09:26:43 kiyohara Exp $
# $NetBSD: VIRTEX_GSRD1,v 1.9 2010/02/08 19:02:28 joerg Exp $
#
# VIRTEX_GSRD1
#
@ -120,7 +120,6 @@ options PPP_FILTER # Active filter support for PPP (requires bpf)
options PFIL_HOOKS # pfil(9) packet filter hooks
options IPFILTER_LOG # ipmon(8) log support
#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG
options NMBCLUSTERS=4096
# These options enable verbose messages for several subsystems.
# Warning, these may compile large string tables into the kernel!

3
sys/arch/evbppc/conf/VIRTEX_GSRD2
View File

@ -1,4 +1,4 @@
# $NetBSD: VIRTEX_GSRD2,v 1.9 2009/12/24 09:26:43 kiyohara Exp $
# $NetBSD: VIRTEX_GSRD2,v 1.10 2010/02/08 19:02:28 joerg Exp $
#
# VIRTEX_GSRD2
#
@ -128,7 +128,6 @@ options PPP_FILTER # Active filter support for PPP (requires bpf)
options PFIL_HOOKS # pfil(9) packet filter hooks
options IPFILTER_LOG # ipmon(8) log support
#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG
options NMBCLUSTERS=4096
# These options enable verbose messages for several subsystems.
# Warning, these may compile large string tables into the kernel!

3
sys/arch/evbppc/conf/WALNUT
View File

@ -1,4 +1,4 @@
# $NetBSD: WALNUT,v 1.44 2009/12/24 09:29:36 kiyohara Exp $
# $NetBSD: WALNUT,v 1.45 2010/02/08 19:02:28 joerg Exp $
#
# GENERIC -- everything that's currently supported
#
@ -111,7 +111,6 @@ options PFIL_HOOKS # pfil(9) packet filter hooks
options IPFILTER_LOG # ipmon(8) log support
options IPFILTER_LOOKUP # ippool(8) support
#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG
options NMBCLUSTERS=1024
# These options enable verbose messages for several subsystems.
# Warning, these may compile large string tables into the kernel!

5
sys/arch/evbppc/explora/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.29 2009/11/27 03:23:08 rmind Exp $ */
/* $NetBSD: machdep.c,v 1.30 2010/02/08 19:02:28 joerg Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.29 2009/11/27 03:23:08 rmind Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.30 2010/02/08 19:02:28 joerg Exp $");
#include "opt_explora.h"
#include "opt_modular.h"
@ -76,7 +76,6 @@ static const unsigned int cpuspeed = 66000000;
prop_dictionary_t board_properties;
struct vm_map *phys_map = NULL;
struct vm_map *mb_map = NULL;
char msgbuf[MSGBUFSIZE];
paddr_t msgbuf_paddr;

6
sys/arch/evbppc/obs405/obs405_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: obs405_machdep.c,v 1.4 2008/07/02 17:28:55 ad Exp $ */
/* $NetBSD: obs405_machdep.c,v 1.5 2010/02/08 19:02:28 joerg Exp $ */
/*
* Copyright (c) 2004 Shigeyuki Fukushima.
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: obs405_machdep.c,v 1.4 2008/07/02 17:28:55 ad Exp $");
__KERNEL_RCSID(0, "$NetBSD: obs405_machdep.c,v 1.5 2010/02/08 19:02:28 joerg Exp $");
#include <sys/param.h>
@ -43,12 +43,10 @@ __KERNEL_RCSID(0, "$NetBSD: obs405_machdep.c,v 1.4 2008/07/02 17:28:55 ad Exp $"
/*
* Machine-dependent global variables
* mb_map: sys/uvm/uvm_extern.h
* phys_map: sys/uvm/uvm_extern.h
* machine: sys/sys/systm.h
* machine_arch: sys/sys/systm.h
*/
struct vm_map *mb_map = NULL;
struct vm_map *phys_map = NULL;
char machine[] = MACHINE; /* from <machine/param.h> */
char machine_arch[] = MACHINE_ARCH; /* from <machine/param.h> */

5
sys/arch/evbppc/virtex/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.12 2009/11/27 03:23:08 rmind Exp $ */
/* $NetBSD: machdep.c,v 1.13 2010/02/08 19:02:28 joerg Exp $ */
/*
* Copyright (c) 2006 Jachym Holecek
@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.12 2009/11/27 03:23:08 rmind Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.13 2010/02/08 19:02:28 joerg Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@ -89,7 +89,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.12 2009/11/27 03:23:08 rmind Exp $");
/*
* Global variables used here and there
*/
struct vm_map *mb_map = NULL;
struct vm_map *phys_map = NULL;
/*

5
sys/arch/evbppc/walnut/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.43 2009/11/27 03:23:08 rmind Exp $ */
/* $NetBSD: machdep.c,v 1.44 2010/02/08 19:02:28 joerg Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.43 2009/11/27 03:23:08 rmind Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.44 2010/02/08 19:02:28 joerg Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@ -120,7 +120,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.43 2009/11/27 03:23:08 rmind Exp $");
/*
* Global variables used here and there
*/
struct vm_map *mb_map = NULL;
struct vm_map *phys_map = NULL;
/*

5
sys/arch/ews4800mips/ews4800mips/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.21 2009/12/14 00:46:03 matt Exp $ */
/* $NetBSD: machdep.c,v 1.22 2010/02/08 19:02:28 joerg Exp $ */
/*-
* Copyright (c) 2001, 2004, 2005 The NetBSD Foundation, Inc.
@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.21 2009/12/14 00:46:03 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.22 2010/02/08 19:02:28 joerg Exp $");
#include "opt_ddb.h"
@ -73,7 +73,6 @@ vsize_t kseg2iobufsize; /* to reserve PTEs for KSEG2 I/O space */
struct cpu_info cpu_info_store;
/* maps for VM objects */
struct vm_map *mb_map;
struct vm_map *phys_map;
/* referenced by mips_machdep.c:cpu_dump() */

6
sys/arch/hp300/conf/GENERIC
View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.151 2009/12/05 20:11:14 pooka Exp $
# $NetBSD: GENERIC,v 1.152 2010/02/08 19:02:28 joerg Exp $
#
# GENERIC machine description file
#
@ -22,7 +22,7 @@ include "arch/hp300/conf/std.hp300"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.151 $"
#ident "GENERIC-$Revision: 1.152 $"
maxusers 32 # estimated number of users
@ -133,7 +133,7 @@ options INET6 # IPV6
#options IPSEC_ESP # IP security (encryption part; define w/IPSEC)
#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
options GATEWAY # IP forwarding + larger mb_map
options GATEWAY # IP forwarding
options MROUTING # Multicast routing
options PIM # Protocol Independent Multicast
#options ISO,TPIP # OSI

5
sys/arch/hp300/conf/INSTALL
View File

@ -1,4 +1,4 @@
# $NetBSD: INSTALL,v 1.39 2009/01/12 17:24:21 tsutsui Exp $
# $NetBSD: INSTALL,v 1.40 2010/02/08 19:02:28 joerg Exp $
#
# INSTALL machine description file
#
@ -14,7 +14,6 @@ makeoptions COPTS="-Os"
options NVNODE=50
options NBUF=16
options BUFPAGES=16
options NMBCLUSTERS=64
options NFS_V2_ONLY
options NFS_DEFAULT_NIOTHREADS=1
options USERCONF # userconf(4) support
@ -95,7 +94,7 @@ options INET # Internet protocols
#options IPSEC_ESP # IP security (encryption part; define w/IPSEC)
#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
#options GATEWAY # IP forwarding + larger mb_map
#options GATEWAY # IP forwarding
#options MROUTING # Multicast routing
#options PIM # Protocol Independent Multicast
#options PFIL_HOOKS # packet filter hooks

12
sys/arch/hp300/hp300/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.210 2009/12/10 14:13:49 matt Exp $ */
/* $NetBSD: machdep.c,v 1.211 2010/02/08 19:02:28 joerg Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.210 2009/12/10 14:13:49 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.211 2010/02/08 19:02:28 joerg Exp $");
#include "opt_ddb.h"
#include "opt_compat_netbsd.h"
@ -154,7 +154,6 @@ char machine[] = MACHINE; /* from <machine/param.h> */
/* Our exported CPU info; we can have only one. */
struct cpu_info cpu_info_store;
struct vm_map *mb_map = NULL;
struct vm_map *phys_map = NULL;
extern paddr_t avail_end;
@ -345,13 +344,6 @@ cpu_startup(void)
phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_PHYS_SIZE, 0, false, NULL);
/*
* Finally, allocate mbuf cluster submap.
*/
mb_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
nmbclusters * mclbytes, VM_MAP_INTRSAFE,
false, NULL);
#ifdef DEBUG
pmapdebug = opmapdebug;
#endif

8
sys/arch/hp700/hp700/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.77 2009/12/10 14:13:49 matt Exp $ */
/* $NetBSD: machdep.c,v 1.78 2010/02/08 19:02:29 joerg Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.77 2009/12/10 14:13:49 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.78 2010/02/08 19:02:29 joerg Exp $");
#include "opt_cputype.h"
#include "opt_ddb.h"
@ -261,7 +261,6 @@ struct cpu_info cpu_info_store = {
#endif
};
struct vm_map *mb_map = NULL;
struct vm_map *phys_map = NULL;
void delay_init(void);
@ -887,9 +886,6 @@ cpu_startup(void)
phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_PHYS_SIZE, 0, false, NULL);
mb_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
nmbclusters * mclbytes, VM_MAP_INTRSAFE, false, NULL);
#ifdef PMAPDEBUG
pmapdebug = opmapdebug;
#endif

5
sys/arch/hpcmips/hpcmips/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.108 2010/01/21 01:23:14 pooka Exp $ */
/* $NetBSD: machdep.c,v 1.109 2010/02/08 19:02:29 joerg Exp $ */
/*-
* Copyright (c) 1999 Shin Takemura, All rights reserved.
@ -108,7 +108,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.108 2010/01/21 01:23:14 pooka Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.109 2010/02/08 19:02:29 joerg Exp $");
#include "opt_vr41xx.h"
#include "opt_tx39xx.h"
@ -219,7 +219,6 @@ static char kernel_path[] = KLOADER_KERNEL_PATH;
#endif /* KLOADER */
/* maps for VM objects */
struct vm_map *mb_map;
struct vm_map *phys_map;
/* physical memory */

5
sys/arch/hppa/include/param.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: param.h,v 1.14 2010/01/17 08:24:06 skrll Exp $ */
/* $NetBSD: param.h,v 1.15 2010/02/08 19:02:29 joerg Exp $ */
/* $OpenBSD: param.h,v 1.12 2001/07/06 02:07:41 provos Exp $ */
@ -87,9 +87,6 @@
#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
/*
* Size of kernel malloc arena in logical pages

5
sys/arch/i386/conf/GENERIC_TINY
View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC_TINY,v 1.122 2010/01/03 03:53:34 dholland Exp $
# $NetBSD: GENERIC_TINY,v 1.123 2010/02/08 19:02:29 joerg Exp $
#
# GENERIC_TINY -- suitable default for 4M machines
# No EISA, PCI, or SCSI.
@ -43,9 +43,6 @@ options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT
#options SYSVSHM # System V-like memory sharing
#options P1003_1B_SEMAPHORE # p1003.1b semaphore support
options NMBCLUSTERS=256
#options USERCONF # userconf(4) support
options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
#options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel

3
sys/arch/i386/conf/INSTALL_TINY
View File

@ -1,4 +1,4 @@
# $NetBSD: INSTALL_TINY,v 1.128 2010/01/03 03:53:34 dholland Exp $
# $NetBSD: INSTALL_TINY,v 1.129 2010/02/08 19:02:29 joerg Exp $
#
# This kernel should be derived from INSTALL (which is derived
# from GENERIC) with some features commented out.
@ -140,7 +140,6 @@ options INET # IP + ICMP + TCP + UDP
options NVNODE=50
options NBUF=20
options BUFPAGES=20
options NMBCLUSTERS=64
# Kernel root file system and dump configuration.
config netbsd root on ? type ?

11
sys/arch/i386/i386/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.681 2009/12/10 14:13:50 matt Exp $ */
/* $NetBSD: machdep.c,v 1.682 2010/02/08 19:02:29 joerg Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008, 2009
@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.681 2009/12/10 14:13:50 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.682 2010/02/08 19:02:29 joerg Exp $");
#include "opt_beep.h"
#include "opt_compat_ibcs2.h"
@ -268,7 +268,6 @@ vaddr_t idt_vaddr;
paddr_t idt_paddr;
vaddr_t pentium_idt_vaddr;
struct vm_map *mb_map = NULL;
struct vm_map *phys_map = NULL;
extern paddr_t avail_start, avail_end;
@ -493,12 +492,6 @@ cpu_startup(void)
phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_PHYS_SIZE, 0, false, NULL);
/*
* Allocate mbuf cluster submap.
*/
mb_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
nmbclusters * mclbytes, VM_MAP_INTRSAFE, false, NULL);
/* Say hello. */
banner();

14
sys/arch/i386/include/param.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: param.h,v 1.71 2009/03/10 20:05:30 bouyer Exp $ */
/* $NetBSD: param.h,v 1.72 2010/02/08 19:02:29 joerg Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@ -127,16 +127,8 @@
#define MCLBYTES (1 << MCLSHIFT) /* size of a m_buf cluster */
#ifndef NMBCLUSTERS
#if defined(_KERNEL_OPT)
#include "opt_gateway.h"
#endif
#ifdef GATEWAY
#define NMBCLUSTERS 2048 /* map size, max cluster allocation */
#else
#define NMBCLUSTERS 1024 /* map size, max cluster allocation */
#endif
#ifndef NMBCLUSTERS_MAX
#define NMBCLUSTERS_MAX (0x2000000 / MCLBYTES) /* Limit to 64MB for clusters */
#endif
#ifndef NFS_RSIZE

3
sys/arch/ia64/ia64/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.22 2009/12/10 14:13:50 matt Exp $ */
/* $NetBSD: machdep.c,v 1.23 2010/02/08 19:02:29 joerg Exp $ */
/*-
* Copyright (c) 2003,2004 Marcel Moolenaar
@ -130,7 +130,6 @@ vaddr_t ia64_unwindtab;
vsize_t ia64_unwindtablen;
#endif
struct vm_map *mb_map = NULL;
struct vm_map *phys_map = NULL;
void *msgbufaddr;

14
sys/arch/ia64/include/param.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: param.h,v 1.3 2009/07/20 04:41:37 kiyohara Exp $ */
/* $NetBSD: param.h,v 1.4 2010/02/08 19:02:29 joerg Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@ -112,18 +112,6 @@
#define MCLBYTES (1 << MCLSHIFT) /* size of a m_buf cluster */
#ifndef NMBCLUSTERS
#if defined(_KERNEL_OPT)
#include "opt_gateway.h"
#endif
#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.

2
sys/arch/ia64/stand/common/help.common
View File

@ -268,7 +268,7 @@
Various kernel tunable parameters can be overridden by specifying new
values in the environment.
set kern.ipc.nmbclusters=<value> NMBCLUSTERS
set kern.ipc.nmbclusters=<value>
Set the number of mbuf clusters to be allocated. The value
cannot be set below the default determined when the kernel

3
sys/arch/luna68k/include/vmparam.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: vmparam.h,v 1.15 2009/12/11 18:57:44 tsutsui Exp $ */
/* $NetBSD: vmparam.h,v 1.16 2010/02/08 19:02:29 joerg Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@ -138,7 +138,6 @@
#define VM_MAX_KERNEL_ADDRESS ((vaddr_t)(0x40000000-PAGE_SIZE*NPTEPG))
/* virtual sizes (bytes) for various kernel submaps */
#define VM_MBUF_SIZE (NMBCLUSTERS*MCLBYTES)
#define VM_PHYS_SIZE (USRIOSIZE*PAGE_SIZE)
/* # of kernel PT pages (initial only, can grow dynamically) */

12
sys/arch/luna68k/luna68k/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.73 2009/12/10 14:13:50 matt Exp $ */
/* $NetBSD: machdep.c,v 1.74 2010/02/08 19:02:30 joerg Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.73 2009/12/10 14:13:50 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.74 2010/02/08 19:02:30 joerg Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@ -95,7 +95,6 @@ char cpu_model[60];
/* Our exported CPU info; we can have only one. */
struct cpu_info cpu_info_store;
struct vm_map *mb_map = NULL;
struct vm_map *phys_map = NULL;
int maxmem; /* max memory per process */
@ -264,13 +263,6 @@ cpu_startup(void)
phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_PHYS_SIZE, 0, false, NULL);
/*
* Finally, allocate mbuf cluster submap.
*/
mb_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
nmbclusters * mclbytes, VM_MAP_INTRSAFE,
false, NULL);
format_bytes(pbuf, sizeof(pbuf), ptoa(uvmexp.free));
printf("avail memory = %s\n", pbuf);

14
sys/arch/m68k/include/param.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: param.h,v 1.16 2009/12/11 17:53:22 tsutsui Exp $ */
/* $NetBSD: param.h,v 1.17 2010/02/08 19:02:30 joerg Exp $ */
/*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@ -141,18 +141,6 @@
#define MCLBYTES (1 << MCLSHIFT) /* size of a m_buf cluster */
#ifndef NMBCLUSTERS
#if defined(_KERNEL_OPT)
#include "opt_gateway.h"
#endif
#ifdef GATEWAY
# define NMBCLUSTERS 512 /* map size, max cluster allocation */
#else
# define NMBCLUSTERS 256 /* map size, max cluster allocation */
#endif
#endif
/*
* Mach-derived conversion macros
*/

11
sys/arch/mac68k/mac68k/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.334 2009/12/10 14:13:50 matt Exp $ */
/* $NetBSD: machdep.c,v 1.335 2010/02/08 19:02:30 joerg Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@ -107,7 +107,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.334 2009/12/10 14:13:50 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.335 2010/02/08 19:02:30 joerg Exp $");
#include "opt_adb.h"
#include "opt_ddb.h"
@ -218,7 +218,6 @@ struct mac68k_video mac68k_video;
int (*mac68k_bell_callback)(void *, int, int, int);
void * mac68k_bell_cookie;
struct vm_map *mb_map = NULL;
struct vm_map *phys_map = NULL;
int maxmem; /* max memory per process */
@ -449,12 +448,6 @@ cpu_startup(void)
phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_PHYS_SIZE, 0, false, NULL);
/*
* Finally, allocate mbuf cluster submap.
*/
mb_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
nmbclusters * mclbytes, VM_MAP_INTRSAFE, false, NULL);
format_bytes(pbuf, sizeof(pbuf), ptoa(uvmexp.free));
printf("avail memory = %s\n", pbuf);

13
sys/arch/mips/include/mips_param.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: mips_param.h,v 1.26 2009/12/14 00:46:05 matt Exp $ */
/* $NetBSD: mips_param.h,v 1.27 2010/02/08 19:02:30 joerg Exp $ */
#ifdef _KERNEL
#include <machine/cpu.h>
@ -124,15 +124,4 @@
#define MCLBYTES (1 << MCLSHIFT) /* size of a m_buf cluster */
#ifndef NMBCLUSTERS
#if defined(_KERNEL_OPT)
#include "opt_gateway.h"
#endif
#ifdef GATEWAY
#define NMBCLUSTERS 2048 /* map size, max cluster allocation */
#else
#define NMBCLUSTERS 1024 /* map size, max cluster allocation */
#endif
#endif
#endif

5
sys/arch/mipsco/mipsco/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.70 2009/12/16 23:19:07 matt Exp $ */
/* $NetBSD: machdep.c,v 1.71 2010/02/08 19:02:30 joerg Exp $ */
/*
* Copyright (c) 1992, 1993
@ -76,7 +76,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.70 2009/12/16 23:19:07 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.71 2010/02/08 19:02:30 joerg Exp $");
/* from: Utah Hdr: machdep.c 1.63 91/04/24 */
@ -142,7 +142,6 @@ struct cpu_info cpu_info_store;
/* maps for VM objects */
struct vm_map *mb_map = NULL;
struct vm_map *phys_map = NULL;
int physmem; /* max supported memory, changes to actual */

11
sys/arch/mvme68k/mvme68k/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.141 2009/12/10 14:13:51 matt Exp $ */
/* $NetBSD: machdep.c,v 1.142 2010/02/08 19:02:30 joerg Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.141 2009/12/10 14:13:51 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.142 2010/02/08 19:02:30 joerg Exp $");
#include "opt_ddb.h"
#include "opt_m060sp.h"
@ -149,7 +149,6 @@ char machine[] = MACHINE; /* from <machine/param.h> */
/* Our exported CPU info; we can have only one. */
struct cpu_info cpu_info_store;
struct vm_map *mb_map = NULL;
struct vm_map *phys_map = NULL;
/*
@ -509,12 +508,6 @@ cpu_startup(void)
phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_PHYS_SIZE, 0, false, NULL);
/*
* Finally, allocate mbuf cluster submap.
*/
mb_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
nmbclusters * mclbytes, VM_MAP_INTRSAFE, false, NULL);
#ifdef DEBUG
pmapdebug = opmapdebug;
#endif

11
sys/arch/news68k/news68k/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.84 2009/12/10 14:13:51 matt Exp $ */
/* $NetBSD: machdep.c,v 1.85 2010/02/08 19:02:30 joerg Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.84 2009/12/10 14:13:51 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.85 2010/02/08 19:02:30 joerg Exp $");
#include "opt_ddb.h"
#include "opt_compat_netbsd.h"
@ -142,7 +142,6 @@ char machine[] = MACHINE; /* from <machine/param.h> */
/* Our exported CPU info; we can have only one. */
struct cpu_info cpu_info_store;
struct vm_map *mb_map = NULL;
struct vm_map *phys_map = NULL;
int maxmem; /* max memory per process */
@ -276,12 +275,6 @@ cpu_startup(void)
phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_PHYS_SIZE, 0, false, NULL);
/*
* Finally, allocate mbuf cluster submap.
*/
mb_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
nmbclusters * mclbytes, VM_MAP_INTRSAFE, false, NULL);
#ifdef DEBUG
pmapdebug = opmapdebug;
#endif

5
sys/arch/newsmips/newsmips/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.107 2009/12/17 05:29:56 matt Exp $ */
/* $NetBSD: machdep.c,v 1.108 2010/02/08 19:02:30 joerg Exp $ */
/*
* Copyright (c) 1992, 1993
@ -76,7 +76,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.107 2009/12/17 05:29:56 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.108 2010/02/08 19:02:30 joerg Exp $");
/* from: Utah Hdr: machdep.c 1.63 91/04/24 */
@ -144,7 +144,6 @@ struct cpu_info cpu_info_store;
/* maps for VM objects */
struct vm_map *mb_map = NULL;
struct vm_map *phys_map = NULL;
char *bootinfo = NULL; /* pointer to bootinfo structure */

12
sys/arch/next68k/next68k/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.97 2009/12/10 14:13:51 matt Exp $ */
/* $NetBSD: machdep.c,v 1.98 2010/02/08 19:02:30 joerg Exp $ */
/*
* Copyright (c) 1998 Darrin B. Jewell
@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.97 2009/12/10 14:13:51 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.98 2010/02/08 19:02:30 joerg Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@ -160,7 +160,6 @@ char machine[] = MACHINE; /* from <machine/param.h> */
/* Our exported CPU info; we can have only one. */
struct cpu_info cpu_info_store;
struct vm_map *mb_map = NULL;
struct vm_map *phys_map = NULL;
paddr_t msgbufpa; /* PA of message buffer */
@ -344,13 +343,6 @@ cpu_startup(void)
phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_PHYS_SIZE, 0, false, NULL);
/*
* Finally, allocate mbuf cluster submap.
*/
mb_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
nmbclusters * mclbytes, VM_MAP_INTRSAFE,
false, NULL);
#ifdef DEBUG
pmapdebug = opmapdebug;
#endif

5
sys/arch/ofppc/conf/GENERIC
View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.122 2009/12/05 20:11:16 pooka Exp $
# $NetBSD: GENERIC,v 1.123 2010/02/08 19:02:30 joerg Exp $
#
# GENERIC machine description file
#
@ -22,7 +22,7 @@ include "arch/ofppc/conf/std.ofppc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.122 $"
#ident "GENERIC-$Revision: 1.123 $"
maxusers 32
@ -133,7 +133,6 @@ options PFIL_HOOKS # pfil(9) packet filter hooks
options IPFILTER_LOG # ipmon(8) log support
options IPFILTER_LOOKUP # ippool(8) support
#options IPFILTER_DEFAULT_BLOCK # block all packets by default
options NMBCLUSTERS=1024
#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG
#options ALTQ # Manipulate network interfaces' output queues

5
sys/arch/ofppc/conf/GENERIC.MP
View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC.MP,v 1.6 2009/12/05 20:11:16 pooka Exp $
# $NetBSD: GENERIC.MP,v 1.7 2010/02/08 19:02:31 joerg Exp $
#
# GENERIC machine description file
#
@ -22,7 +22,7 @@ include "arch/ofppc/conf/std.ofppc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.6 $"
#ident "GENERIC-$Revision: 1.7 $"
maxusers 32
@ -138,7 +138,6 @@ options PFIL_HOOKS # pfil(9) packet filter hooks
options IPFILTER_LOG # ipmon(8) log support
options IPFILTER_LOOKUP # ippool(8) support
#options IPFILTER_DEFAULT_BLOCK # block all packets by default
options NMBCLUSTERS=1024
#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG
#options ALTQ # Manipulate network interfaces' output queues

5
sys/arch/pmax/pmax/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.238 2009/12/14 00:46:11 matt Exp $ */
/* $NetBSD: machdep.c,v 1.239 2010/02/08 19:02:31 joerg Exp $ */
/*
* Copyright (c) 1992, 1993
@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.238 2009/12/14 00:46:11 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.239 2010/02/08 19:02:31 joerg Exp $");
#include "fs_mfs.h"
#include "opt_ddb.h"
@ -132,7 +132,6 @@ unsigned int ssir; /* simulated interrupt register */
struct cpu_info cpu_info_store;
/* maps for VM objects */
struct vm_map *mb_map = NULL;
struct vm_map *phys_map = NULL;
int systype; /* mother board type */

15
sys/arch/powerpc/include/param.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: param.h,v 1.20 2006/08/28 13:43:35 yamt Exp $ */
/* $NetBSD: param.h,v 1.21 2010/02/08 19:02:31 joerg Exp $ */
/*-
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -98,19 +98,6 @@
#endif
#define MCLBYTES (1 << MCLSHIFT) /* size of a m_buf cluster */
#ifndef NMBCLUSTERS
#if defined(_KERNEL_OPT)
#include "opt_gateway.h"
#endif
#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.

15
sys/arch/powerpc/oea/oea_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: oea_machdep.c,v 1.51 2009/11/27 03:23:12 rmind Exp $ */
/* $NetBSD: oea_machdep.c,v 1.52 2010/02/08 19:02:31 joerg Exp $ */
/*
* Copyright (C) 2002 Matt Thomas
@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: oea_machdep.c,v 1.51 2009/11/27 03:23:12 rmind Exp $");
__KERNEL_RCSID(0, "$NetBSD: oea_machdep.c,v 1.52 2010/02/08 19:02:31 joerg Exp $");
#include "opt_ppcarch.h"
#include "opt_compat_netbsd.h"
@ -88,7 +88,6 @@ __KERNEL_RCSID(0, "$NetBSD: oea_machdep.c,v 1.51 2009/11/27 03:23:12 rmind Exp $
char machine[] = MACHINE; /* from <machine/param.h> */
char machine_arch[] = MACHINE_ARCH; /* from <machine/param.h> */
struct vm_map *mb_map = NULL;
struct vm_map *phys_map = NULL;
/*
@ -786,16 +785,6 @@ oea_startup(const char *model)
phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_PHYS_SIZE, 0, false, NULL);
#ifndef PMAP_MAP_POOLPAGE
/*
* No need to allocate an mbuf cluster submap. Mbuf clusters
* are allocated via the pool allocator, and we use direct-mapped
* pool pages.
*/
mb_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
mclbytes*nmbclusters, VM_MAP_INTRSAFE, false, NULL);
#endif
format_bytes(pbuf, sizeof(pbuf), ptoa(uvmexp.free));
printf("avail memory = %s\n", pbuf);
}

5
sys/arch/sbmips/sbmips/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.46 2009/12/16 19:02:03 matt Exp $ */
/* $NetBSD: machdep.c,v 1.47 2010/02/08 19:02:31 joerg Exp $ */
/*
* Copyright 2000, 2001
@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.46 2009/12/16 19:02:03 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.47 2010/02/08 19:02:31 joerg Exp $");
#include "opt_ddb.h"
#include "opt_execfmt.h"
@ -125,7 +125,6 @@ void *ksym_start, *ksym_end;
struct cpu_info cpu_info_store;
/* Maps for VM objects. */
struct vm_map *mb_map = NULL;
struct vm_map *phys_map = NULL;
int physmem; /* Total physical memory */

5
sys/arch/sgimips/sgimips/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.132 2009/12/16 23:19:07 matt Exp $ */
/* $NetBSD: machdep.c,v 1.133 2010/02/08 19:02:31 joerg Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang
@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.132 2009/12/16 23:19:07 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.133 2010/02/08 19:02:31 joerg Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@ -116,7 +116,6 @@ struct sgimips_intrhand intrtab[NINTR];
struct cpu_info cpu_info_store;
/* Maps for VM objects. */
struct vm_map *mb_map = NULL;
struct vm_map *phys_map = NULL;
int mach_type = 0; /* IPxx type */

14
sys/arch/sh3/include/param.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: param.h,v 1.19 2007/10/26 22:24:51 uwe Exp $ */
/* $NetBSD: param.h,v 1.20 2010/02/08 19:02:31 joerg Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc. All rights reserved.
@ -104,18 +104,6 @@
#define MCLBYTES (1 << MCLSHIFT) /* size of a m_buf cluster */
#ifndef NMBCLUSTERS
#if defined(_KERNEL_OPT)
#include "opt_gateway.h"
#endif
#ifdef GATEWAY
#define NMBCLUSTERS 512 /* map size, max cluster allocation */
#else
#define NMBCLUSTERS 256 /* map size, max cluster allocation */
#endif
#endif
/*
* Minimum and maximum sizes of the kernel malloc arena in PAGE_SIZE-sized
* logical pages.

5
sys/arch/sh3/sh3/sh3_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sh3_machdep.c,v 1.85 2009/12/10 14:13:51 matt Exp $ */
/* $NetBSD: sh3_machdep.c,v 1.86 2010/02/08 19:02:31 joerg Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2002 The NetBSD Foundation, Inc.
@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: sh3_machdep.c,v 1.85 2009/12/10 14:13:51 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: sh3_machdep.c,v 1.86 2010/02/08 19:02:31 joerg Exp $");
#include "opt_kgdb.h"
#include "opt_memsize.h"
@ -110,7 +110,6 @@ int cpu_arch;
int cpu_product;
char cpu_model[120];
struct vm_map *mb_map;
struct vm_map *phys_map;
struct pcb *curpcb;

5
sys/arch/shark/conf/GENERIC
View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.87 2010/01/18 23:40:06 jmmv Exp $
# $NetBSD: GENERIC,v 1.88 2010/02/08 19:02:31 joerg Exp $
#
# Generic Shark configuration.
#
@ -7,7 +7,7 @@ include "arch/shark/conf/std.shark"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.87 $"
#ident "GENERIC-$Revision: 1.88 $"
# estimated number of users
maxusers 32
@ -17,7 +17,6 @@ maxusers 32
options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT
options HZ=64
#options NTP # NTP phase/frequency locked loop
options NMBCLUSTERS=1024 # XXX, temporarily required
#options BOOT_QUIETLY # twiddle instead of normal boot msg output
# CPU options

3
sys/arch/shark/conf/INSTALL
View File

@ -1,4 +1,4 @@
# $NetBSD: INSTALL,v 1.42 2009/12/05 20:11:17 pooka Exp $
# $NetBSD: INSTALL,v 1.43 2010/02/08 19:02:31 joerg Exp $
#
# Shark installation kernel
#
@ -16,7 +16,6 @@ maxusers 32
options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT
options HZ=64
#options NTP # NTP phase/frequency locked loop
options NMBCLUSTERS=1024 # XXX, temporarily required
#options BOOT_QUIETLY # twiddle instead of normal boot msg output
# CPU options

14
sys/arch/sparc/include/param.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: param.h,v 1.66 2006/08/28 13:43:35 yamt Exp $ */
/* $NetBSD: param.h,v 1.67 2010/02/08 19:02:31 joerg Exp $ */
/*
* Copyright (c) 1992, 1993
@ -125,18 +125,6 @@ extern int nbpg, pgofset, pgshift;
#define MCLBYTES (1 << MCLSHIFT) /* size of a m_buf cluster */
#ifndef NMBCLUSTERS
#if defined(_KERNEL_OPT)
#include "opt_gateway.h"
#endif
#ifdef GATEWAY
#define NMBCLUSTERS 512 /* map size, max cluster allocation */
#else
#define NMBCLUSTERS 256 /* map size, max cluster allocation */
#endif
#endif
/*
* Minimum and maximum sizes of the kernel malloc arena in PAGE_SIZE-sized
* logical pages.

13
sys/arch/sparc/sparc/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.301 2010/01/26 03:06:01 mrg Exp $ */
/* $NetBSD: machdep.c,v 1.302 2010/02/08 19:02:31 joerg Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.301 2010/01/26 03:06:01 mrg Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.302 2010/02/08 19:02:31 joerg Exp $");
#include "opt_compat_netbsd.h"
#include "opt_compat_sunos.h"
@ -135,7 +135,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.301 2010/01/26 03:06:01 mrg Exp $");
#include <sparc/dev/power.h>
#endif
struct vm_map *mb_map = NULL;
extern paddr_t avail_end;
int physmem;
@ -168,7 +167,6 @@ cpu_startup(void)
int opmapdebug = pmapdebug;
#endif
struct pcb *pcb;
vaddr_t minaddr, maxaddr;
vsize_t size;
paddr_t pa;
char pbuf[9];
@ -313,7 +311,6 @@ cpu_startup(void)
#endif
}
minaddr = 0;
if (CPU_ISSUN4 || CPU_ISSUN4C) {
/*
* Allocate DMA map for 24-bit devices (le, ie)
@ -326,12 +323,6 @@ cpu_startup(void)
panic("unable to allocate DVMA map");
}
/*
* Finally, allocate mbuf cluster submap.
*/
mb_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
nmbclusters * mclbytes, VM_MAP_INTRSAFE, false, NULL);
#ifdef DEBUG
pmapdebug = opmapdebug;
#endif

14
sys/arch/sparc64/include/param.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: param.h,v 1.43 2008/08/26 11:37:56 rjs Exp $ */
/* $NetBSD: param.h,v 1.44 2010/02/08 19:02:32 joerg Exp $ */
/*
* Copyright (c) 1992, 1993
@ -208,18 +208,6 @@ extern int nbpg, pgofset, pgshift;
#define MCLBYTES (1 << MCLSHIFT) /* size of a m_buf cluster */
#ifndef NMBCLUSTERS
#if defined(_KERNEL_OPT)
#include "opt_gateway.h"
#endif
#ifdef GATEWAY
#define NMBCLUSTERS 2048 /* map size, max cluster allocation */
#else
#define NMBCLUSTERS 1024 /* map size, max cluster allocation */
#endif
#endif
#define MSGBUFSIZE NBPG
/*

14
sys/arch/sparc64/sparc64/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.250 2009/12/07 11:28:37 nakayama Exp $ */
/* $NetBSD: machdep.c,v 1.251 2010/02/08 19:02:32 joerg Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.250 2009/12/07 11:28:37 nakayama Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.251 2010/02/08 19:02:32 joerg Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@ -146,7 +146,6 @@ int sigpid = 0;
#endif
#endif
struct vm_map *mb_map = NULL;
extern vaddr_t avail_end;
int physmem;
@ -181,7 +180,6 @@ cpu_startup(void)
extern int pmapdebug;
int opmapdebug = pmapdebug;
#endif
vaddr_t minaddr, maxaddr;
char pbuf[9];
#ifdef DEBUG
@ -196,14 +194,6 @@ cpu_startup(void)
format_bytes(pbuf, sizeof(pbuf), ctob((uint64_t)physmem));
printf("total memory = %s\n", pbuf);
minaddr = 0;
/*
* Finally, allocate mbuf cluster submap.
*/
mb_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
nmbclusters * mclbytes, VM_MAP_INTRSAFE, FALSE, NULL);
#ifdef DEBUG
pmapdebug = opmapdebug;
#endif

8
sys/arch/sun2/include/param.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: param.h,v 1.11 2009/12/11 13:56:15 tsutsui Exp $ */
/* $NetBSD: param.h,v 1.12 2010/02/08 19:02:32 joerg Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@ -106,11 +106,9 @@
#define MAXPHYS 0xe000
/*
* XXX fredette - we force a small number of mbuf clusters and cluster
* size to help me debug this on my low-memory machine. These should
* go away at some point.
* XXX fredette - we force a small cluster size to help me debug
* this on my low-memory machine. These should go away at some point.
*/
#define NMBCLUSTERS 64 /* map size, max cluster allocation */
#define MCLSHIFT 10
/*

12
sys/arch/sun2/sun2/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.64 2009/12/10 14:13:52 matt Exp $ */
/* $NetBSD: machdep.c,v 1.65 2010/02/08 19:02:32 joerg Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@ -153,7 +153,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.64 2009/12/10 14:13:52 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.65 2010/02/08 19:02:32 joerg Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@ -234,7 +234,6 @@ extern u_int bufpages;
/* Our exported CPU info; we can have only one. */
struct cpu_info cpu_info_store;
struct vm_map *mb_map = NULL;
struct vm_map *phys_map = NULL;
int physmem;
@ -345,13 +344,6 @@ cpu_startup(void)
phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_PHYS_SIZE, 0, false, NULL);
/*
* Finally, allocate mbuf cluster submap.
*/
mb_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
nmbclusters * mclbytes, VM_MAP_INTRSAFE,
false, NULL);
format_bytes(pbuf, sizeof(pbuf), ptoa(uvmexp.free));
printf("avail memory = %s\n", pbuf);

12
sys/arch/sun3/sun3/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.196 2009/12/10 14:13:52 matt Exp $ */
/* $NetBSD: machdep.c,v 1.197 2010/02/08 19:02:32 joerg Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@ -78,7 +78,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.196 2009/12/10 14:13:52 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.197 2010/02/08 19:02:32 joerg Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@ -142,7 +142,6 @@ extern char etext[];
/* Our exported CPU info; we can have only one. */
struct cpu_info cpu_info_store;
struct vm_map *mb_map = NULL;
struct vm_map *phys_map = NULL;
int physmem;
@ -257,13 +256,6 @@ cpu_startup(void)
phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_PHYS_SIZE, 0, false, NULL);
/*
* Finally, allocate mbuf cluster submap.
*/
mb_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
nmbclusters * mclbytes, VM_MAP_INTRSAFE,
false, NULL);
format_bytes(pbuf, sizeof(pbuf), ptoa(uvmexp.free));
printf("avail memory = %s\n", pbuf);

12
sys/arch/sun3/sun3x/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.122 2009/12/10 14:13:52 matt Exp $ */
/* $NetBSD: machdep.c,v 1.123 2010/02/08 19:02:32 joerg Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.122 2009/12/10 14:13:52 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.123 2010/02/08 19:02:32 joerg Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@ -139,7 +139,6 @@ extern char etext[];
/* Our exported CPU info; we can have only one. */
struct cpu_info cpu_info_store;
struct vm_map *mb_map = NULL;
struct vm_map *phys_map = NULL;
int physmem;
@ -257,13 +256,6 @@ cpu_startup(void)
phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_PHYS_SIZE, 0, false, NULL);
/*
* Finally, allocate mbuf cluster submap.
*/
mb_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
nmbclusters * mclbytes, VM_MAP_INTRSAFE,
false, NULL);
format_bytes(pbuf, sizeof(pbuf), ptoa(uvmexp.free));
printf("avail memory = %s\n", pbuf);

10
sys/arch/usermode/dev/cpu.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cpu.c,v 1.6 2009/11/27 03:23:14 rmind Exp $ */
/* $NetBSD: cpu.c,v 1.7 2010/02/08 19:02:32 joerg Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <jmcneill@invisible.ca>
@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.6 2009/11/27 03:23:14 rmind Exp $");
__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.7 2010/02/08 19:02:32 joerg Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@ -307,18 +307,12 @@ cpu_initclocks(void)
void
cpu_startup(void)
{
extern struct vm_map *mb_map;
vaddr_t minaddr, maxaddr;
char pbuf[9];
printf("%s%s", copyright, version);
format_bytes(pbuf, sizeof(pbuf), ptoa(physmem));
printf("total memory = %s\n", pbuf);
minaddr = 0;
mb_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
nmbclusters * mclbytes, VM_MAP_INTRSAFE, false, NULL);
format_bytes(pbuf, sizeof(pbuf), ptoa(uvmexp.free));
printf("avail memory = %s\n", pbuf);
}

5
sys/arch/usermode/usermode/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.8 2009/12/10 14:13:52 matt Exp $ */
/* $NetBSD: machdep.c,v 1.9 2010/02/08 19:02:32 joerg Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <jmcneill@invisible.ca>
@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.8 2009/12/10 14:13:52 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.9 2010/02/08 19:02:32 joerg Exp $");
#include <sys/types.h>
#include <sys/param.h>
@ -47,7 +47,6 @@ char machine_arch[] = "usermode";
int usermode_x = IPL_NONE;
/* XXX */
int physmem = MEMSIZE * 1024 / PAGE_SIZE;
struct vm_map *mb_map = NULL;
void main(int argc, char *argv[]);

14
sys/arch/vax/include/param.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: param.h,v 1.57 2009/11/21 04:45:39 rmind Exp $ */
/* $NetBSD: param.h,v 1.58 2010/02/08 19:02:32 joerg Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@ -112,18 +112,6 @@
#define MCLBYTES (1 << MCLSHIFT) /* size of a m_buf cluster */
#ifndef NMBCLUSTERS
#if defined(_KERNEL_OPT)
#include "opt_gateway.h"
#endif
#ifdef GATEWAY
#define NMBCLUSTERS 512 /* map size, max cluster allocation */
#else
#define NMBCLUSTERS 256 /* map size, max cluster allocation */
#endif
#endif
/*
* Minimum and maximum sizes of the kernel malloc arena in PAGE_SIZE-sized
* logical pages.

5
sys/arch/vax/vax/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.178 2009/11/21 04:45:39 rmind Exp $ */
/* $NetBSD: machdep.c,v 1.179 2010/02/08 19:02:32 joerg Exp $ */
/*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@ -83,7 +83,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.178 2009/11/21 04:45:39 rmind Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.179 2010/02/08 19:02:32 joerg Exp $");
#include "opt_ddb.h"
#include "opt_compat_netbsd.h"
@ -163,7 +163,6 @@ static long iomap_ex_storage[EXTENT_FIXED_STORAGE_SIZE(32) / sizeof(long)];
static struct extent *iomap_ex;
static int iomap_ex_malloc_safe;
struct vm_map *mb_map = NULL;
struct vm_map *phys_map = NULL;
#ifdef DEBUG

12
sys/arch/x68k/x68k/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.164 2009/12/10 14:13:53 matt Exp $ */
/* $NetBSD: machdep.c,v 1.165 2010/02/08 19:02:32 joerg Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.164 2009/12/10 14:13:53 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.165 2010/02/08 19:02:32 joerg Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@ -151,7 +151,6 @@ char machine[] = MACHINE; /* from <machine/param.h> */
/* Our exported CPU info; we can have only one. */
struct cpu_info cpu_info_store;
struct vm_map *mb_map = NULL;
struct vm_map *phys_map = NULL;
extern paddr_t avail_start, avail_end;
@ -297,13 +296,6 @@ cpu_startup(void)
phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_PHYS_SIZE, 0, false, NULL);
/*
* Finally, allocate mbuf cluster submap.
*/
mb_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
nmbclusters * mclbytes, VM_MAP_INTRSAFE,
false, NULL);
#ifdef DEBUG
pmapdebug = opmapdebug;
#endif

7
sys/conf/param.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: param.c,v 1.62 2009/05/03 21:25:44 elad Exp $ */
/* $NetBSD: param.c,v 1.63 2010/02/08 19:02:33 joerg Exp $ */
/*
* Copyright (c) 1980, 1986, 1989 Regents of the University of California.
@ -37,13 +37,12 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: param.c,v 1.62 2009/05/03 21:25:44 elad Exp $");
__KERNEL_RCSID(0, "$NetBSD: param.c,v 1.63 2010/02/08 19:02:33 joerg Exp $");
#include "opt_hz.h"
#include "opt_rtc_offset.h"
#include "opt_sysv.h"
#include "opt_sysvparam.h"
#include "opt_nmbclusters.h"
#include "opt_multiprocessor.h"
#include <sys/param.h>
@ -135,7 +134,7 @@ size_t coherency_unit = ALIGNBYTES + 1;
* Various mbuf-related parameters. These can also be changed at run-time
* with sysctl.
*/
int nmbclusters = NMBCLUSTERS;
int nmbclusters = 0;
#ifndef MBLOWAT
#define MBLOWAT 16

57
sys/kern/uipc_mbuf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: uipc_mbuf.c,v 1.132 2009/04/05 16:31:21 bouyer Exp $ */
/* $NetBSD: uipc_mbuf.c,v 1.133 2010/02/08 19:02:33 joerg Exp $ */
/*-
* Copyright (c) 1999, 2001 The NetBSD Foundation, Inc.
@ -62,9 +62,10 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.132 2009/04/05 16:31:21 bouyer Exp $");
__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.133 2010/02/08 19:02:33 joerg Exp $");
#include "opt_mbuftrace.h"
#include "opt_nmbclusters.h"
#include "opt_ddb.h"
#include <sys/param.h>
@ -122,7 +123,7 @@ static int m_copyback0(struct mbuf **, int, int, const void *, int, int);
#define M_COPYBACK0_EXTEND 0x0008 /* extend chain */
static const char mclpool_warnmsg[] =
"WARNING: mclpool limit reached; increase NMBCLUSTERS";
"WARNING: mclpool limit reached; increase kern.mbuf.nmbclusters";
MALLOC_DEFINE(M_MBUF, "mbuf", "mbuf");
@ -157,6 +158,28 @@ do { \
MCLREFDEBUGN((n), __FILE__, __LINE__); \
} while (/* CONSTCOND */ 0)
static int
nmbclusters_limit(void)
{
#ifdef PMAP_MAP_POOLPAGE
/* direct mapping, doesn't use space in kmem_map */
vsize_t max_size = physmem / 4;
#else
vsize_t max_size = MIN(physmem / 4, nkmempages / 2);
#endif
max_size = max_size * PAGE_SIZE / MCLBYTES;
#ifdef NMBCLUSTERS_MAX
max_size = MIN(max_size, NMBCLUSTERS_MAX);
#endif
#ifdef NMBCLUSTERS
return MIN(max_size, NMBCLUSTERS);
#else
return max_size;
#endif
}
/*
* Initialize the mbuf allocator.
*/
@ -169,7 +192,7 @@ mbinit(void)
sysctl_kern_mbuf_setup();
mclpool_allocator.pa_backingmap = mb_map;
mclpool_allocator.pa_backingmap = kmem_map;
mb_cache = pool_cache_init(msize, 0, 0, 0, "mbpl",
NULL, IPL_VM, mb_ctor, NULL, NULL);
@ -182,6 +205,17 @@ mbinit(void)
pool_cache_set_drain_hook(mb_cache, m_reclaim, NULL);
pool_cache_set_drain_hook(mcl_cache, m_reclaim, NULL);
/*
* Set an arbitrary default limit on the number of mbuf clusters.
*/
#ifdef NMBCLUSTERS
nmbclusters = nmbclusters_limit();
#else
nmbclusters = MAX(1024,
(vsize_t)physmem * PAGE_SIZE / MCLBYTES / 16);
nmbclusters = MIN(nmbclusters, nmbclusters_limit());
#endif
/*
* Set the hard limit on the mclpool to the number of
* mbuf clusters the kernel is to support. Log the limit
@ -215,8 +249,8 @@ mbinit(void)
}
/*
* sysctl helper routine for the kern.mbuf subtree. nmbclusters may
* or may not be writable, and mblowat and mcllowat need range
* sysctl helper routine for the kern.mbuf subtree.
* nmbclusters, mblowat and mcllowat need range
* checking and pool tweaking after being reset.
*/
static int
@ -229,11 +263,6 @@ sysctl_kern_mbuf(SYSCTLFN_ARGS)
node.sysctl_data = &newval;
switch (rnode->sysctl_num) {
case MBUF_NMBCLUSTERS:
if (mb_map != NULL) {
node.sysctl_flags &= ~CTLFLAG_READWRITE;
node.sysctl_flags |= CTLFLAG_READONLY;
}
/* FALLTHROUGH */
case MBUF_MBLOWAT:
case MBUF_MCLLOWAT:
newval = *(int*)rnode->sysctl_data;
@ -252,6 +281,8 @@ sysctl_kern_mbuf(SYSCTLFN_ARGS)
case MBUF_NMBCLUSTERS:
if (newval < nmbclusters)
return (EINVAL);
if (newval > nmbclusters_limit())
return (EINVAL);
nmbclusters = newval;
pool_cache_sethardlimit(mcl_cache, nmbclusters,
mclpool_warnmsg, 60);
@ -433,14 +464,14 @@ mclpool_alloc(struct pool *pp, int flags)
{
bool waitok = (flags & PR_WAITOK) ? true : false;
return ((void *)uvm_km_alloc_poolpage(mb_map, waitok));
return ((void *)uvm_km_alloc_poolpage(kmem_map, waitok));
}
static void
mclpool_release(struct pool *pp, void *v)
{
uvm_km_free_poolpage(mb_map, (vaddr_t)v);
uvm_km_free_poolpage(kmem_map, (vaddr_t)v);
}
/*ARGSUSED*/

6
sys/netipsec/keysock.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: keysock.c,v 1.18 2009/03/18 16:00:23 cegger Exp $ */
/* $NetBSD: keysock.c,v 1.19 2010/02/08 19:02:33 joerg Exp $ */
/* $FreeBSD: src/sys/netipsec/keysock.c,v 1.3.2.1 2003/01/24 05:11:36 sam Exp $ */
/* $KAME: keysock.c,v 1.25 2001/08/13 20:07:41 itojun Exp $ */
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: keysock.c,v 1.18 2009/03/18 16:00:23 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: keysock.c,v 1.19 2010/02/08 19:02:33 joerg Exp $");
#include "opt_ipsec.h"
@ -85,7 +85,7 @@ static struct sockaddr key_src = {
static int key_sendup0(struct rawcb *, struct mbuf *, int, int);
int key_registered_sb_max = (NMBCLUSTERS * MHLEN); /* XXX arbitrary */
int key_registered_sb_max = (2048 * MHLEN); /* XXX arbitrary */
/* XXX sysctl */
#ifdef __FreeBSD__

5
sys/rump/librump/rumpkern/emul.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: emul.c,v 1.121 2010/01/31 15:12:42 pooka Exp $ */
/* $NetBSD: emul.c,v 1.122 2010/02/08 19:02:33 joerg Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.121 2010/01/31 15:12:42 pooka Exp $");
__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.122 2010/02/08 19:02:33 joerg Exp $");
#include <sys/param.h>
#include <sys/null.h>
@ -73,7 +73,6 @@ int doing_shutdown;
const int schedppq = 1;
int hardclock_ticks;
bool mp_online = false;
struct vm_map *mb_map;
struct timeval boottime;
struct emul emul_netbsd;
int cold = 1;

3
sys/uvm/uvm_extern.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: uvm_extern.h,v 1.161 2009/11/21 17:45:02 rmind Exp $ */
/* $NetBSD: uvm_extern.h,v 1.162 2010/02/08 19:02:33 joerg Exp $ */
/*
*
@ -551,7 +551,6 @@ void uvm_reclaim_hook_del(struct uvm_reclaim_hook *);
*/
extern struct vm_map *kernel_map;
extern struct vm_map *kmem_map;
extern struct vm_map *mb_map;
extern struct vm_map *phys_map;
/*

5
sys/uvm/uvm_km.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: uvm_km.c,v 1.104 2009/11/07 07:27:49 cegger Exp $ */
/* $NetBSD: uvm_km.c,v 1.105 2010/02/08 19:02:33 joerg Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@ -91,7 +91,6 @@
* the vm system has several standard kernel submaps, including:
* kmem_map => contains only wired kernel memory for the kernel
* malloc.
* mb_map => memory for large mbufs,
* pager_map => used to map "buf" structures into kernel space
* exec_map => used during exec to handle exec args
* etc...
@ -128,7 +127,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: uvm_km.c,v 1.104 2009/11/07 07:27:49 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: uvm_km.c,v 1.105 2010/02/08 19:02:33 joerg Exp $");
#include "opt_uvmhist.h"

6
sys/uvm/uvm_map.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: uvm_map.c,v 1.286 2009/12/15 06:15:11 matt Exp $ */
/* $NetBSD: uvm_map.c,v 1.287 2010/02/08 19:02:33 joerg Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.286 2009/12/15 06:15:11 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.287 2010/02/08 19:02:33 joerg Exp $");
#include "opt_ddb.h"
#include "opt_uvmhist.h"
@ -2332,7 +2332,7 @@ uvm_unmap_remove(struct vm_map *map, vaddr_t start, vaddr_t end,
* if the map is non-pageable, any pages mapped there
* must be wired and entered with pmap_kenter_pa(),
* and we should free any such pages immediately.
* this is mostly used for kmem_map and mb_map.
* this is mostly used for kmem_map.
*/
if ((entry->flags & UVM_MAP_KMAPENT) == 0) {