No need to include <sys/dmap.h> and define related variables.

7 files changed, 36 insertions, 16 deletions

diff --git a/sys/arch/hp300/hp300/autoconf.c b/sys/arch/hp300/hp300/autoconf.c
index bd7ff0198d2..a4964a23c84 100644
--- a/sys/arch/hp300/hp300/autoconf.c
+++ b/sys/arch/hp300/hp300/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.19 2001/09/19 21:32:19 miod Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.20 2001/12/10 00:58:02 miod Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.45 1999/04/10 17:31:02 kleink Exp $	*/
 
 /*
@@ -70,7 +70,6 @@
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/disklabel.h>
-#include <sys/dmap.h>
 #include <sys/malloc.h>
 #include <sys/map.h>
 #include <sys/mount.h>
diff --git a/sys/arch/i386/i386/autoconf.c b/sys/arch/i386/i386/autoconf.c
index 23790f336c8..3ba2e618dad 100644
--- a/sys/arch/i386/i386/autoconf.c
+++ b/sys/arch/i386/i386/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.40 2001/12/05 23:58:41 tdeval Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.41 2001/12/10 00:58:04 miod Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.20 1996/05/03 19:41:56 christos Exp $	*/
 
 /*-
@@ -53,7 +53,6 @@
 #include <sys/dkstat.h>
 #include <sys/disklabel.h>
 #include <sys/conf.h>
-#include <sys/dmap.h>
 #include <sys/reboot.h>
 #include <sys/device.h>
 
@@ -198,7 +197,6 @@ findblkname(maj)
 dev_t	argdev = NODEV;
 int	nswap;
 long	dumplo;
-int	dmmin, dmmax, dmtext;
 
 /*
  * Attempt to find the device from which we were booted.
diff --git a/sys/arch/mac68k/dev/nubus.c b/sys/arch/mac68k/dev/nubus.c
index ee321500dd6..211b08bafb4 100644
--- a/sys/arch/mac68k/dev/nubus.c
+++ b/sys/arch/mac68k/dev/nubus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nubus.c,v 1.23 2001/12/08 02:24:06 art Exp $	*/
+/*	$OpenBSD: nubus.c,v 1.24 2001/12/10 00:58:04 miod Exp $	*/
 /*	$NetBSD: nubus.c,v 1.35 1997/04/22 20:20:32 scottr Exp $	*/
 
 /*
@@ -35,7 +35,6 @@
 #include <sys/device.h>
 #include <sys/buf.h>
 #include <sys/conf.h>
-#include <sys/dmap.h>
 
 #include <uvm/uvm_extern.h>
 
diff --git a/sys/arch/mvme68k/mvme68k/autoconf.c b/sys/arch/mvme68k/mvme68k/autoconf.c
index 9dfda5b40ab..8fcfcbd093b 100644
--- a/sys/arch/mvme68k/mvme68k/autoconf.c
+++ b/sys/arch/mvme68k/mvme68k/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.14 2001/09/19 21:32:19 miod Exp $ */
+/*	$OpenBSD: autoconf.c,v 1.15 2001/12/10 00:58:04 miod Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -79,13 +79,18 @@
  * and the drivers are initialized.
  */
 
+#undef TRY_EXTENT
+
 #include <sys/param.h>
 #include <sys/systm.h>
+#ifdef TRY_EXTENT
+#include <sys/extent.h>
+#else
 #include <sys/map.h>
+#endif
 #include <sys/buf.h>
 #include <sys/dkstat.h>
 #include <sys/conf.h>
-#include <sys/dmap.h>
 #include <sys/reboot.h>
 #include <sys/device.h>
 #include <sys/disklabel.h>
@@ -100,7 +105,12 @@ struct	device *parsedisk __P((char *, int, int, dev_t *));
 void	setroot __P((void));
 
 /* XXX must be allocated statically because of early console init */
-struct	map extiomap[EIOMAPSIZE/16];
+#ifdef TRY_EXTENT
+static char iomap_space[EXTENT_FIXED_STORAGE_SIZE(EIOMAPSIZE / 16)];
+struct extent *iomap_extent;
+#else
+struct map extiomap[EIOMAPSIZE/16];
+#endif
 extern	void *extiobase;
 
 void mainbus_attach __P((struct device *, struct device *, void *));
@@ -181,7 +191,16 @@ cpu_configure()
 
 	init_sir();
 
+#ifdef TRY_EXTENT
+	iomap_extent = extent_create("iomap", &iomap_space,
+	    iomap_space  + EXTENT_FIXED_STORAGE_SIZE(EIOMAPSIZE / 16),
+	    M_DEVBUF, &iomap_space, EXTENT_FIXED_STORAGE_SIZE(EIOMAPSIZE / 16),
+	    EX_NOWAIT);
+	if (iomap_extent == NULL)
+		panic("cpu_configure: extent_create failed");
+#else
 	rminit(extiomap, (long)EIOMAPSIZE, (long)1, "extio", EIOMAPSIZE/16);
+#endif
 
 	if (config_rootfound("mainbus", NULL) == NULL)
 		panic("autoconfig failed, no root");
@@ -202,6 +221,9 @@ mapiodev(pa, size)
 {
 	int ix, npf, offset;
 	void *kva;
+#ifdef TRY_EXTENT
+	int error;
+#endif
 
 	size = roundup(size, NBPG);
 	offset = (int)pa & PGOFSET;
@@ -212,7 +234,12 @@ mapiodev(pa, size)
 	        panic("mapiodev: unaligned");
 #endif
 	npf = btoc(size);
+#ifdef TRY_EXTENT
+	error = extent_alloc(iomap_extent, npf, EX_NOALIGN, 0, EX_NOBOUNDARY,
+	    EX_NOWAIT, &ix);
+#else
 	ix = rmalloc(extiomap, npf);
+#endif
 	if (ix == 0)
 	        return (0);
 	kva = extiobase + ctob(ix-1);
diff --git a/sys/arch/mvme88k/mvme88k/autoconf.c b/sys/arch/mvme88k/mvme88k/autoconf.c
index d5d8356a24a..86ddea18b1a 100644
--- a/sys/arch/mvme88k/mvme88k/autoconf.c
+++ b/sys/arch/mvme88k/mvme88k/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.16 2001/11/20 23:55:39 miod Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.17 2001/12/10 00:58:04 miod Exp $	*/
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -36,7 +36,6 @@
 #include <sys/map.h>
 #include <sys/buf.h>
 #include <sys/dkstat.h>
-#include <sys/dmap.h>
 #include <sys/reboot.h>
 #include <sys/conf.h>
 #include <sys/device.h>
diff --git a/sys/arch/sparc/sparc/autoconf.c b/sys/arch/sparc/sparc/autoconf.c
index a9df174168a..d7795a6bdd5 100644
--- a/sys/arch/sparc/sparc/autoconf.c
+++ b/sys/arch/sparc/sparc/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.45 2001/12/08 02:24:07 art Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.46 2001/12/10 00:58:04 miod Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.73 1997/07/29 09:41:53 fair Exp $ */
 
 /*
@@ -57,7 +57,6 @@
 #include <sys/disk.h>
 #include <sys/dkstat.h>
 #include <sys/conf.h>
-#include <sys/dmap.h>
 #include <sys/reboot.h>
 #include <sys/socket.h>
 #include <sys/malloc.h>
diff --git a/sys/arch/sun3/sun3/autoconf.c b/sys/arch/sun3/sun3/autoconf.c
index ef9c4dc780b..2d381e0acfc 100644
--- a/sys/arch/sun3/sun3/autoconf.c
+++ b/sys/arch/sun3/sun3/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.18 2001/12/08 02:24:07 art Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.19 2001/12/10 00:58:05 miod Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.37 1996/11/20 18:57:22 gwr Exp $	*/
 
 /*-
@@ -52,7 +52,6 @@
 #include <sys/device.h>
 #include <sys/disklabel.h>
 #include <sys/dkstat.h>
-#include <sys/dmap.h>
 #include <sys/map.h>
 #include <sys/reboot.h>