summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtur Grabowski <art@cvs.openbsd.org>2001-09-12 00:23:35 +0000
committerArtur Grabowski <art@cvs.openbsd.org>2001-09-12 00:23:35 +0000
commitc918dfdb9d34e555ea4f71f7af2f5a6ad293ee3e (patch)
treefa30365eb7733d2f8365f14368982e822f0d5934
parentc23e615700de879d0e8c9571533f4e4d74483250 (diff)
mbutl no more
Diffstat
-rw-r--r--sys/arch/alpha/alpha/machdep.c4
-rw-r--r--sys/arch/amiga/amiga/machdep.c4
-rw-r--r--sys/arch/hppa/hppa/machdep.c4
-rw-r--r--sys/arch/i386/i386/machdep.c4
-rw-r--r--sys/arch/mac68k/mac68k/machdep.c4
-rw-r--r--sys/arch/macppc/macppc/machdep.c4
-rw-r--r--sys/arch/mvme68k/mvme68k/machdep.c4
-rw-r--r--sys/arch/mvme88k/mvme88k/machdep.c4
-rw-r--r--sys/arch/mvmeppc/mvmeppc/machdep.c4
-rw-r--r--sys/arch/sparc/sparc/machdep.c4
-rw-r--r--sys/arch/sun3/sun3/machdep.c4
-rw-r--r--sys/arch/vax/vax/machdep.c4
-rw-r--r--sys/kern/uipc_mbuf.c3
-rw-r--r--sys/sys/mbuf.h3
14 files changed, 26 insertions, 28 deletions
diff --git a/sys/arch/alpha/alpha/machdep.c b/sys/arch/alpha/alpha/machdep.c
index 485d0404e17..6ca0a219669 100644
--- a/sys/arch/alpha/alpha/machdep.c
+++ b/sys/arch/alpha/alpha/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.51 2001/08/23 14:01:02 art Exp $ */
+/* $OpenBSD: machdep.c,v 1.52 2001/09/12 00:23:33 art Exp $ */
/* $NetBSD: machdep.c,v 1.206 2000/05/23 05:12:54 thorpej Exp $ */
/*-
@@ -978,7 +978,7 @@ cpu_startup()
phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_PHYS_SIZE, 0, FALSE, NULL);
- mb_map = uvm_km_suballoc(kernel_map, (vaddr_t *)&mbutl, &maxaddr,
+ mb_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_MBUF_SIZE, VM_MAP_INTRSAFE, FALSE, NULL);
#if defined(DEBUG)
diff --git a/sys/arch/amiga/amiga/machdep.c b/sys/arch/amiga/amiga/machdep.c
index 040693a31fc..d9dc31b2fcd 100644
--- a/sys/arch/amiga/amiga/machdep.c
+++ b/sys/arch/amiga/amiga/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.52 2001/08/23 14:01:02 art Exp $ */
+/* $OpenBSD: machdep.c,v 1.53 2001/09/12 00:23:33 art Exp $ */
/* $NetBSD: machdep.c,v 1.95 1997/08/27 18:31:17 is Exp $ */
/*
@@ -472,7 +472,7 @@ again:
phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_PHYS_SIZE, 0, FALSE, NULL);
- mb_map = uvm_km_suballoc(kernel_map, (vaddr_t *)&mbutl, &maxaddr,
+ mb_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_MBUF_SIZE, VM_MAP_INTRSAFE, FALSE, NULL);
#ifdef DEBUG
diff --git a/sys/arch/hppa/hppa/machdep.c b/sys/arch/hppa/hppa/machdep.c
index 7a7b7a67469..81024d5830a 100644
--- a/sys/arch/hppa/hppa/machdep.c
+++ b/sys/arch/hppa/hppa/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.38 2001/08/23 14:01:03 art Exp $ */
+/* $OpenBSD: machdep.c,v 1.39 2001/09/12 00:23:33 art Exp $ */
/*
* Copyright (c) 1999-2000 Michael Shalayeff
@@ -662,7 +662,7 @@ cpu_startup()
phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_PHYS_SIZE, 0, FALSE, NULL);
- mb_map = uvm_km_suballoc(kernel_map, (vaddr_t *)&mbutl, &maxaddr,
+ mb_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_MBUF_SIZE, VM_MAP_INTRSAFE, FALSE, NULL);
#ifdef DEBUG
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index 17545da54f0..478968028a0 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.174 2001/08/23 14:01:03 art Exp $ */
+/* $OpenBSD: machdep.c,v 1.175 2001/09/12 00:23:33 art Exp $ */
/* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */
/*-
@@ -399,7 +399,7 @@ cpu_startup()
phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_PHYS_SIZE, 0, FALSE, NULL);
- mb_map = uvm_km_suballoc(kernel_map, (vm_offset_t *)&mbutl, &maxaddr,
+ mb_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_MBUF_SIZE, VM_MAP_INTRSAFE, FALSE, NULL);
printf("avail mem = %lu (%uK)\n", ptoa(uvmexp.free),
diff --git a/sys/arch/mac68k/mac68k/machdep.c b/sys/arch/mac68k/mac68k/machdep.c
index 4eaf1799d5c..5e1801d1228 100644
--- a/sys/arch/mac68k/mac68k/machdep.c
+++ b/sys/arch/mac68k/mac68k/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.81 2001/09/11 20:10:00 miod Exp $ */
+/* $OpenBSD: machdep.c,v 1.82 2001/09/12 00:23:33 art Exp $ */
/* $NetBSD: machdep.c,v 1.207 1998/07/08 04:39:34 thorpej Exp $ */
/*
@@ -505,7 +505,7 @@ again:
phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_PHYS_SIZE, 0, FALSE, NULL);
- mb_map = uvm_km_suballoc(kernel_map, (vm_offset_t *)&mbutl, &maxaddr,
+ mb_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_MBUF_SIZE, VM_MAP_INTRSAFE, FALSE, NULL);
printf("avail mem = %ld\n", ptoa(uvmexp.free));
diff --git a/sys/arch/macppc/macppc/machdep.c b/sys/arch/macppc/macppc/machdep.c
index 8ca46a239c3..bbdeb5e1ced 100644
--- a/sys/arch/macppc/macppc/machdep.c
+++ b/sys/arch/macppc/macppc/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.2 2001/09/11 20:10:00 miod Exp $ */
+/* $OpenBSD: machdep.c,v 1.3 2001/09/12 00:23:33 art Exp $ */
/* $NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $ */
/*
@@ -578,7 +578,7 @@ cpu_startup()
VM_PHYS_SIZE, 0, FALSE, NULL);
ppc_malloc_ok = 1;
- mb_map = uvm_km_suballoc(kernel_map, (vm_offset_t *)&mbutl, &maxaddr,
+ mb_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_MBUF_SIZE, VM_MAP_INTRSAFE, FALSE, NULL);
printf("avail mem = %d\n", ptoa(uvmexp.free));
diff --git a/sys/arch/mvme68k/mvme68k/machdep.c b/sys/arch/mvme68k/mvme68k/machdep.c
index eca7c701e1a..ea80750f89f 100644
--- a/sys/arch/mvme68k/mvme68k/machdep.c
+++ b/sys/arch/mvme68k/mvme68k/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.51 2001/08/25 11:37:26 espie Exp $ */
+/* $OpenBSD: machdep.c,v 1.52 2001/09/12 00:23:33 art Exp $ */
/*
* Copyright (c) 1995 Theo de Raadt
@@ -393,7 +393,7 @@ again:
phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_PHYS_SIZE, 0, FALSE, NULL);
- mb_map = uvm_km_suballoc(kernel_map, (vaddr_t *)&mbutl, &maxaddr,
+ mb_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_MBUF_SIZE, VM_MAP_INTRSAFE, FALSE, NULL);
#ifdef DEBUG
pmapdebug = opmapdebug;
diff --git a/sys/arch/mvme88k/mvme88k/machdep.c b/sys/arch/mvme88k/mvme88k/machdep.c
index f75e5e8fc65..ec405addb02 100644
--- a/sys/arch/mvme88k/mvme88k/machdep.c
+++ b/sys/arch/mvme88k/mvme88k/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.56 2001/08/26 14:31:12 miod Exp $ */
+/* $OpenBSD: machdep.c,v 1.57 2001/09/12 00:23:33 art Exp $ */
/*
* Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
* Copyright (c) 1996 Nivas Madhur
@@ -661,7 +661,7 @@ cpu_startup()
if (iomap_extent == NULL)
panic("unable to allocate extent for iomap");
- mb_map = uvm_km_suballoc(kernel_map, (vaddr_t *)&mbutl, &maxaddr,
+ mb_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_MBUF_SIZE, VM_MAP_INTRSAFE, FALSE, NULL);
printf("avail mem = %ld (%ld pages)\n", ptoa(uvmexp.free), uvmexp.free);
diff --git a/sys/arch/mvmeppc/mvmeppc/machdep.c b/sys/arch/mvmeppc/mvmeppc/machdep.c
index 1a862b0b844..b7cc92df46f 100644
--- a/sys/arch/mvmeppc/mvmeppc/machdep.c
+++ b/sys/arch/mvmeppc/mvmeppc/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.8 2001/09/11 20:10:00 miod Exp $ */
+/* $OpenBSD: machdep.c,v 1.9 2001/09/12 00:23:34 art Exp $ */
/* $NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $ */
/*
@@ -572,7 +572,7 @@ cpu_startup()
ppc_malloc_ok = 1;
- mb_map = uvm_km_suballoc(kernel_map, (vm_offset_t *)&mbutl, &maxaddr,
+ mb_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_MBUF_SIZE, VM_MAP_INTRSAFE, FALSE, NULL);
printf("avail mem = %d\n", ptoa(uvmexp.free));
diff --git a/sys/arch/sparc/sparc/machdep.c b/sys/arch/sparc/sparc/machdep.c
index 9e5237e9bbd..a0f5e3a784e 100644
--- a/sys/arch/sparc/sparc/machdep.c
+++ b/sys/arch/sparc/sparc/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.62 2001/08/23 14:01:03 art Exp $ */
+/* $OpenBSD: machdep.c,v 1.63 2001/09/12 00:23:34 art Exp $ */
/* $NetBSD: machdep.c,v 1.85 1997/09/12 08:55:02 pk Exp $ */
/*
@@ -279,7 +279,7 @@ cpu_startup()
if (dvmamap_extent == 0)
panic("unable to allocate extent for dvma");
- mb_map = uvm_km_suballoc(kernel_map, (vaddr_t *)&mbutl, &maxaddr,
+ mb_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_MBUF_SIZE, VM_MAP_INTRSAFE, FALSE, NULL);
#ifdef DEBUG
pmapdebug = opmapdebug;
diff --git a/sys/arch/sun3/sun3/machdep.c b/sys/arch/sun3/sun3/machdep.c
index e5e051484ad..d3a9a73292b 100644
--- a/sys/arch/sun3/sun3/machdep.c
+++ b/sys/arch/sun3/sun3/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.39 2001/08/25 11:37:26 espie Exp $ */
+/* $OpenBSD: machdep.c,v 1.40 2001/09/12 00:23:34 art Exp $ */
/* $NetBSD: machdep.c,v 1.77 1996/10/13 03:47:51 christos Exp $ */
/*
@@ -337,7 +337,7 @@ cpu_startup()
* device drivers clone the kernel mappings into DVMA space.
*/
- mb_map = uvm_km_suballoc(kernel_map, (vm_offset_t *)&mbutl, &maxaddr,
+ mb_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_MBUF_SIZE, VM_MAP_INTRSAFE, FALSE, NULL);
printf("avail mem = %ld\n", ptoa(uvmexp.free));
diff --git a/sys/arch/vax/vax/machdep.c b/sys/arch/vax/vax/machdep.c
index 713d443e833..a10f66c1bf2 100644
--- a/sys/arch/vax/vax/machdep.c
+++ b/sys/arch/vax/vax/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.38 2001/08/23 14:01:03 art Exp $ */
+/* $OpenBSD: machdep.c,v 1.39 2001/09/12 00:23:34 art Exp $ */
/* $NetBSD: machdep.c,v 1.108 2000/09/13 15:00:23 thorpej Exp $ */
/*
@@ -267,7 +267,7 @@ cpu_startup()
phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_PHYS_SIZE, 0, FALSE, NULL);
- mb_map = uvm_km_suballoc(kernel_map, (vaddr_t *)&mbutl, &maxaddr,
+ mb_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_MBUF_SIZE, VM_MAP_INTRSAFE, FALSE, NULL);
printf("avail memory = %ld\n", ptoa(uvmexp.free));
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c
index ca66569b876..a5f473ddbb1 100644
--- a/sys/kern/uipc_mbuf.c
+++ b/sys/kern/uipc_mbuf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uipc_mbuf.c,v 1.40 2001/06/27 04:49:47 art Exp $ */
+/* $OpenBSD: uipc_mbuf.c,v 1.41 2001/09/12 00:23:33 art Exp $ */
/* $NetBSD: uipc_mbuf.c,v 1.15.4.1 1996/06/13 17:11:44 cgd Exp $ */
/*
@@ -71,7 +71,6 @@ struct pool mbpool; /* mbuf pool */
struct pool mclpool; /* mbuf cluster pool */
extern vm_map_t mb_map;
-struct mbuf *mbutl;
int needqueuedrain;
void *mclpool_alloc __P((unsigned long, int, int));
diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h
index bd9ab0322bc..30924975b39 100644
--- a/sys/sys/mbuf.h
+++ b/sys/sys/mbuf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: mbuf.h,v 1.53 2001/08/24 14:31:58 angelos Exp $ */
+/* $OpenBSD: mbuf.h,v 1.54 2001/09/12 00:23:33 art Exp $ */
/* $NetBSD: mbuf.h,v 1.19 1996/02/09 18:25:14 christos Exp $ */
/*
@@ -531,7 +531,6 @@ struct mbstat {
};
#ifdef _KERNEL
-extern struct mbuf *mbutl; /* virtual address of mclusters */
struct mbstat mbstat;
extern int nmbclusters; /* limit on the # of clusters */
extern int mblowat; /* mbuf low water mark */
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-03 16:15:59 +0000