diff options
| author | bmilekic <bmilekic@FreeBSD.org> | 2001-08-03 05:05:32 +0000 |
|---|---|---|
| committer | bmilekic <bmilekic@FreeBSD.org> | 2001-08-03 05:05:32 +0000 |
| commit | 4dfee5e935f7e902daa509e671c878346ba8b53f (patch) | |
| tree | 4065fab208699392b4caf79971f5b341afc6688f | |
| parent | 258022abac2dafc927de0217edc422372b5a364b (diff) | |
| download | FreeBSD-src-4dfee5e935f7e902daa509e671c878346ba8b53f.zip FreeBSD-src-4dfee5e935f7e902daa509e671c878346ba8b53f.tar.gz | |
Rename mb_init() mbuf subsystem initialization routine to mbuf_init(), in
order to avoid namespace collision with subr_mchain.c's mb_init(). This
wasn't "fatal" as the mbuf initialization routine mb_init() was local to
subr_mbuf.c which in turn didn't pull in subr_mchain.c's mb_init()
declaration, but it should deffinately be changed now before it creates
headache.
| -rw-r--r-- | sys/kern/kern_malloc.c | 2 | ||||
| -rw-r--r-- | sys/kern/subr_mbuf.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c index e57f250..dcabed0 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -470,7 +470,7 @@ kmeminit(dummy) vm_kmem_size = 2 * cnt.v_page_count * PAGE_SIZE; /* - * In mb_init(), we set up submaps for mbufs and clusters, in which + * In mbuf_init(), we set up submaps for mbufs and clusters, in which * case we rounddown() (nmbufs * MSIZE) and (nmbclusters * MCLBYTES), * respectively. Mathematically, this means that what we do here may * amount to slightly more address space than we need for the submaps, diff --git a/sys/kern/subr_mbuf.c b/sys/kern/subr_mbuf.c index 30efab8..08def9c 100644 --- a/sys/kern/subr_mbuf.c +++ b/sys/kern/subr_mbuf.c @@ -279,7 +279,7 @@ SYSCTL_OPAQUE(_kern_ipc, OID_AUTO, mb_statpcpu, CTLFLAG_RD, mb_statpcpu, static __inline void *mb_alloc(struct mb_lstmngr *, int); void *mb_alloc_wait(struct mb_lstmngr *); static __inline void mb_free(struct mb_lstmngr *, void *); -static void mb_init(void *); +static void mbuf_init(void *); struct mb_bucket *mb_pop_cont(struct mb_lstmngr *, int, struct mb_pcpu_list *); void mb_reclaim(void); @@ -304,9 +304,9 @@ void mb_reclaim(void); * the PCPU containers with initial numbers. */ MALLOC_DEFINE(M_MBUF, "mbufmgr", "mbuf subsystem management structures"); -SYSINIT(mbuf, SI_SUB_MBUF, SI_ORDER_FIRST, mb_init, NULL) +SYSINIT(mbuf, SI_SUB_MBUF, SI_ORDER_FIRST, mbuf_init, NULL) void -mb_init(void *dummy) +mbuf_init(void *dummy) { struct mb_pcpu_list *pcpu_cnt; vm_size_t mb_map_size; @@ -451,7 +451,7 @@ mb_init(void *dummy) return; bad: - panic("mb_init(): failed to initialize mbuf subsystem!"); + panic("mbuf_init(): failed to initialize mbuf subsystem!"); } /* |
