Index: sys/arch/algor/dev/mainbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/algor/dev/mainbus.c,v
retrieving revision 1.21
diff -u -r1.21 mainbus.c
--- sys/arch/algor/dev/mainbus.c	20 Feb 2011 07:51:21 -0000	1.21
+++ sys/arch/algor/dev/mainbus.c	13 Apr 2011 20:00:04 -0000
@@ -159,9 +159,9 @@
 	 * Reserve the bottom 64K of the I/O space for ISA devices.
 	 */
 	ioext  = extent_create("pciio",  0x00010000, 0x000effff,
-	    M_DEVBUF, NULL, 0, EX_NOWAIT);
+	    NULL, 0, EX_NOWAIT);
 	memext = extent_create("pcimem", 0x01000000, 0x07ffffff,
-	    M_DEVBUF, NULL, 0, EX_NOWAIT);
+	    NULL, 0, EX_NOWAIT);
 
 	pc = &p4032_configuration.ac_pc;
 #elif defined(ALGOR_P5064)
@@ -171,9 +171,9 @@
 	 * a bug in the ISA bridge.
 	 */
 	ioext  = extent_create("pciio",  0x00080000, 0x00ffffff,
-	    M_DEVBUF, NULL, 0, EX_NOWAIT);
+	    NULL, 0, EX_NOWAIT);
 	memext = extent_create("pcimem", 0x01000000, 0x07ffffff,
-	    M_DEVBUF, NULL, 0, EX_NOWAIT);
+	    NULL, 0, EX_NOWAIT);
 
 	pc = &p5064_configuration.ac_pc;
 #if defined(PCI_NETBSD_ENABLE_IDE)
@@ -184,9 +184,9 @@
 	 * Reserve the bottom 64K of the I/O space for ISA devices.
 	 */
 	ioext  = extent_create("pciio",  0x00010000, 0x000effff,
-	    M_DEVBUF, NULL, 0, EX_NOWAIT);
+	    NULL, 0, EX_NOWAIT);
 	memext = extent_create("pcimem", 0x01000000, 0x0affffff,
-	    M_DEVBUF, NULL, 0, EX_NOWAIT);
+	    NULL, 0, EX_NOWAIT);
 
 	pc = &p6032_configuration.ac_pc;
 #if defined(PCI_NETBSD_ENABLE_IDE)
Index: sys/arch/alpha/alpha/pmap.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/alpha/pmap.c,v
retrieving revision 1.255
diff -u -r1.255 pmap.c
--- sys/arch/alpha/alpha/pmap.c	12 Nov 2010 07:59:25 -0000	1.255
+++ sys/arch/alpha/alpha/pmap.c	13 Apr 2011 20:00:09 -0000
@@ -759,7 +759,7 @@
 	/*
 	 * Compute the number of pages kmem_map will have.
 	 */
-	kmeminit_nkmempages();
+	uvm_km_setupkmemsize();
 
 	/*
 	 * Figure out how many initial PTE's are necessary to map the
Index: sys/arch/alpha/common/sgmap_common.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/common/sgmap_common.c,v
retrieving revision 1.24
diff -u -r1.24 sgmap_common.c
--- sys/arch/alpha/common/sgmap_common.c	28 Apr 2008 20:23:11 -0000	1.24
+++ sys/arch/alpha/common/sgmap_common.c	13 Apr 2011 20:00:09 -0000
@@ -107,7 +107,7 @@
 	 * space.
 	 */
 	sgmap->aps_ex = extent_create(name, sgvabase, sgvasize - 1,
-	    M_DMAMAP, NULL, 0, EX_NOWAIT|EX_NOCOALESCE);
+	    NULL, 0, EX_NOWAIT|EX_NOCOALESCE);
 	if (sgmap->aps_ex == NULL) {
 		printf("unable to create extent map for sgmap `%s'\n",
 		    name);
Index: sys/arch/alpha/pci/pci_bwx_bus_io_chipdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/pci/pci_bwx_bus_io_chipdep.c,v
retrieving revision 1.18
diff -u -r1.18 pci_bwx_bus_io_chipdep.c
--- sys/arch/alpha/pci/pci_bwx_bus_io_chipdep.c	14 Mar 2009 14:45:53 -0000	1.18
+++ sys/arch/alpha/pci/pci_bwx_bus_io_chipdep.c	13 Apr 2011 20:00:12 -0000
@@ -302,7 +302,7 @@
 	t->abs_c_8 =		__C(CHIP,_io_copy_region_8);
 
 	ex = extent_create(__S(__C(CHIP,_bus_io)), 0x0UL, 0xffffffffUL,
-	    M_DEVBUF, (void *)CHIP_IO_EX_STORE(v), CHIP_IO_EX_STORE_SIZE(v),
+	    (void *)CHIP_IO_EX_STORE(v), CHIP_IO_EX_STORE_SIZE(v),
 	    EX_NOWAIT|EX_NOCOALESCE);
 
 	CHIP_IO_EXTENT(v) = ex;
Index: sys/arch/alpha/pci/pci_bwx_bus_mem_chipdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/pci/pci_bwx_bus_mem_chipdep.c,v
retrieving revision 1.22
diff -u -r1.22 pci_bwx_bus_mem_chipdep.c
--- sys/arch/alpha/pci/pci_bwx_bus_mem_chipdep.c	14 Mar 2009 14:45:53 -0000	1.22
+++ sys/arch/alpha/pci/pci_bwx_bus_mem_chipdep.c	13 Apr 2011 20:00:13 -0000
@@ -302,7 +302,7 @@
 	t->abs_c_8 =		__C(CHIP,_mem_copy_region_8);
 
 	ex = extent_create(__S(__C(CHIP,_bus_mem)), 0x0UL, 0xffffffffUL,
-	    M_DEVBUF, (void *)CHIP_MEM_EX_STORE(v), CHIP_MEM_EX_STORE_SIZE(v),
+	    (void *)CHIP_MEM_EX_STORE(v), CHIP_MEM_EX_STORE_SIZE(v),
 	    EX_NOWAIT|EX_NOCOALESCE);
 
         CHIP_MEM_EXTENT(v) = ex;
Index: sys/arch/alpha/pci/pci_swiz_bus_io_chipdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/pci/pci_swiz_bus_io_chipdep.c,v
retrieving revision 1.38
diff -u -r1.38 pci_swiz_bus_io_chipdep.c
--- sys/arch/alpha/pci/pci_swiz_bus_io_chipdep.c	18 Mar 2009 07:41:54 -0000	1.38
+++ sys/arch/alpha/pci/pci_swiz_bus_io_chipdep.c	13 Apr 2011 20:00:14 -0000
@@ -307,7 +307,7 @@
 
 	/* XXX WE WANT EXTENT_NOCOALESCE, BUT WE CAN'T USE IT. XXX */
 	ex = extent_create(__S(__C(CHIP,_bus_io)), 0x0UL, 0xffffffffUL,
-	    M_DEVBUF, (void *)CHIP_IO_EX_STORE(v), CHIP_IO_EX_STORE_SIZE(v),
+	    (void *)CHIP_IO_EX_STORE(v), CHIP_IO_EX_STORE_SIZE(v),
 	    EX_NOWAIT);
 	extent_alloc_region(ex, 0, 0xffffffffUL, EX_NOWAIT);
 
Index: sys/arch/alpha/pci/pci_swiz_bus_mem_chipdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/pci/pci_swiz_bus_mem_chipdep.c,v
retrieving revision 1.43
diff -u -r1.43 pci_swiz_bus_mem_chipdep.c
--- sys/arch/alpha/pci/pci_swiz_bus_mem_chipdep.c	18 Mar 2009 07:41:54 -0000	1.43
+++ sys/arch/alpha/pci/pci_swiz_bus_mem_chipdep.c	13 Apr 2011 20:00:16 -0000
@@ -329,7 +329,7 @@
 #ifdef CHIP_D_MEM_W1_SYS_START
 	/* XXX WE WANT EXTENT_NOCOALESCE, BUT WE CAN'T USE IT. XXX */
 	dex = extent_create(__S(__C(CHIP,_bus_dmem)), 0x0UL,
-	    0xffffffffffffffffUL, M_DEVBUF,
+	    0xffffffffffffffffUL,
 	    (void *)CHIP_D_MEM_EX_STORE(v), CHIP_D_MEM_EX_STORE_SIZE(v),
 	    EX_NOWAIT);
 	extent_alloc_region(dex, 0, 0xffffffffffffffffUL, EX_NOWAIT);
@@ -352,7 +352,7 @@
 
 	/* XXX WE WANT EXTENT_NOCOALESCE, BUT WE CAN'T USE IT. XXX */
 	sex = extent_create(__S(__C(CHIP,_bus_smem)), 0x0UL,
-	    0xffffffffffffffffUL, M_DEVBUF,
+	    0xffffffffffffffffUL,
 	    (void *)CHIP_S_MEM_EX_STORE(v), CHIP_S_MEM_EX_STORE_SIZE(v),
 	    EX_NOWAIT);
 	extent_alloc_region(sex, 0, 0xffffffffffffffffUL, EX_NOWAIT);
Index: sys/arch/arc/arc/bus_space.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arc/arc/bus_space.c,v
retrieving revision 1.10
diff -u -r1.10 bus_space.c
--- sys/arch/arc/arc/bus_space.c	28 Apr 2008 20:23:13 -0000	1.10
+++ sys/arch/arc/arc/bus_space.c	13 Apr 2011 20:00:17 -0000
@@ -76,7 +76,7 @@
 {
 
 	bst->bs_extent = extent_create(bst->bs_name,
-	    bst->bs_start, bst->bs_start + bst->bs_size, M_DEVBUF,
+	    bst->bs_start, bst->bs_start + bst->bs_size,
 	    storage, storagesize, EX_NOWAIT);
 	if (bst->bs_extent == NULL)
 		panic("arc_bus_space_init_extent: cannot create extent map %s",
Index: sys/arch/arc/arc/wired_map_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arc/arc/wired_map_machdep.c,v
retrieving revision 1.6
diff -u -r1.6 wired_map_machdep.c
--- sys/arch/arc/arc/wired_map_machdep.c	16 Dec 2009 23:19:06 -0000	1.6
+++ sys/arch/arc/arc/wired_map_machdep.c	13 Apr 2011 20:00:17 -0000
@@ -55,7 +55,7 @@
 
 	mips3_nwired_page = 0;
 	arc_wired_map_ex = extent_create("wired_map",
-	    VM_MIN_WIRED_MAP_ADDRESS, VM_MAX_WIRED_MAP_ADDRESS, M_DEVBUF,
+	    VM_MIN_WIRED_MAP_ADDRESS, VM_MAX_WIRED_MAP_ADDRESS,
 	    (void *)wired_map_ex_storage, sizeof(wired_map_ex_storage),
 	    EX_NOWAIT);
 	if (arc_wired_map_ex == NULL)
Index: sys/arch/arc/jazz/jazzdmatlb.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arc/jazz/jazzdmatlb.c,v
retrieving revision 1.14
diff -u -r1.14 jazzdmatlb.c
--- sys/arch/arc/jazz/jazzdmatlb.c	1 Mar 2006 12:38:10 -0000	1.14
+++ sys/arch/arc/jazz/jazzdmatlb.c	13 Apr 2011 20:00:18 -0000
@@ -85,8 +85,7 @@
 	mips_dcache_wbinv_all();/* Make sure no map entries are cached */
 	memset((char *)dma_tlb, 0, JAZZ_DMATLB_SIZE);
 
-	dmatlbmap = extent_create("dmatlb", 0, NDMATLB, M_DEVBUF, NULL, 0,
-	    EX_NOWAIT);
+	dmatlbmap = extent_create("dmatlb", 0, NDMATLB, NULL, 0, EX_NOWAIT);
 	if (dmatlbmap == NULL)
 		panic("jazz_dmatlb_init: cannot create extent map");
 
Index: sys/arch/arc/pci/necpb.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arc/pci/necpb.c,v
retrieving revision 1.35
diff -u -r1.35 necpb.c
--- sys/arch/arc/pci/necpb.c	4 Apr 2011 20:37:45 -0000	1.35
+++ sys/arch/arc/pci/necpb.c	13 Apr 2011 20:00:18 -0000
@@ -243,9 +243,9 @@
 	pc = &sc->sc_ncp->nc_pc;
 #ifdef PCI_NETBSD_CONFIGURE
 	pc->pc_ioext = extent_create("necpbio", 0x00100000, 0x01ffffff,
-	    M_DEVBUF, NULL, 0, EX_NOWAIT);
+	    NULL, 0, EX_NOWAIT);
 	pc->pc_memext = extent_create("necpbmem", 0x08000000, 0x3fffffff,
-	    M_DEVBUF, NULL, 0, EX_NOWAIT);
+	    NULL, 0, EX_NOWAIT);
 	pci_configure_bus(pc, pc->pc_ioext, pc->pc_memext, NULL, 0,
 	    mips_cache_info.mci_dcache_align);
 #endif
Index: sys/arch/arm/arm32/pmap.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/arm32/pmap.c,v
retrieving revision 1.221
diff -u -r1.221 pmap.c
--- sys/arch/arm/arm32/pmap.c	10 Mar 2011 07:47:14 -0000	1.221
+++ sys/arch/arm/arm32/pmap.c	13 Apr 2011 20:00:23 -0000
@@ -199,6 +199,7 @@
 #include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/pool.h>
+#include <sys/kmem.h>
 #include <sys/cdefs.h>
 #include <sys/cpu.h>
 #include <sys/sysctl.h>
@@ -5492,7 +5493,7 @@
 	needed = (maxproc / PMAP_DOMAINS) + ((maxproc % PMAP_DOMAINS) ? 1 : 0);
 	needed -= 1;
 
-	l1 = malloc(sizeof(*l1) * needed, M_VMPMAP, M_WAITOK);
+	l1 = kmem_alloc(sizeof(*l1) * needed, KM_SLEEP);
 
 	for (loop = 0; loop < needed; loop++, l1++) {
 		/* Allocate a L1 page table */
Index: sys/arch/arm/gemini/gemini_pci.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/gemini/gemini_pci.c,v
retrieving revision 1.9
diff -u -r1.9 gemini_pci.c
--- sys/arch/arm/gemini/gemini_pci.c	4 Apr 2011 20:37:45 -0000	1.9
+++ sys/arch/arm/gemini/gemini_pci.c	13 Apr 2011 20:00:23 -0000
@@ -211,7 +211,7 @@
 	ioext  = extent_create("pciio",
 		GEMINI_PCIIO_BASE,
 		GEMINI_PCIIO_BASE + GEMINI_PCIIO_SIZE - 1,
-		M_DEVBUF, NULL, 0, EX_NOWAIT);
+		NULL, 0, EX_NOWAIT);
 
 	/*
 	 * XXX PCI mem addr should be inherited ?
@@ -219,7 +219,7 @@
 	memext = extent_create("pcimem",
 		GEMINI_PCIMEM_BASE,
 		GEMINI_PCIMEM_BASE + GEMINI_PCIMEM_SIZE - 1,
-		M_DEVBUF, NULL, 0, EX_NOWAIT);
+		NULL, 0, EX_NOWAIT);
 
 	pci_configure_bus(pc, ioext, memext, NULL, 0, arm_dcache_align);
 
Index: sys/arch/arm/ixp12x0/ixp12x0_pci.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/ixp12x0/ixp12x0_pci.c,v
retrieving revision 1.10
diff -u -r1.10 ixp12x0_pci.c
--- sys/arch/arm/ixp12x0/ixp12x0_pci.c	14 Mar 2009 21:04:05 -0000	1.10
+++ sys/arch/arm/ixp12x0/ixp12x0_pci.c	13 Apr 2011 20:00:23 -0000
@@ -95,12 +95,12 @@
 
 #if NPCI > 0 && defined(PCI_NETBSD_CONFIGURE)
 	ioext  = extent_create("pciio", 0, IXP12X0_PCI_IO_SIZE - 1,
-				M_DEVBUF, NULL, 0, EX_NOWAIT);
+				NULL, 0, EX_NOWAIT);
 	/* PCI MEM space is mapped same address as real memory */
 	memext = extent_create("pcimem", IXP12X0_PCI_MEM_HWBASE,
 				IXP12X0_PCI_MEM_HWBASE +
 				IXP12X0_PCI_MEM_SIZE - 1,
-				M_DEVBUF, NULL, 0, EX_NOWAIT);
+				NULL, 0, EX_NOWAIT);
 	printf("%s: configuring PCI bus\n", sc->sc_dev.dv_xname);
 	pci_configure_bus(pc, ioext, memext, NULL, 0 /* XXX bus = 0 */,
 			  arm_dcache_align);
Index: sys/arch/arm/s3c2xx0/s3c2800_pci.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/s3c2xx0/s3c2800_pci.c,v
retrieving revision 1.14
diff -u -r1.14 s3c2800_pci.c
--- sys/arch/arm/s3c2xx0/s3c2800_pci.c	4 Apr 2011 20:37:46 -0000	1.14
+++ sys/arch/arm/s3c2xx0/s3c2800_pci.c	13 Apr 2011 20:00:25 -0000
@@ -293,10 +293,10 @@
 
 #if defined(PCI_NETBSD_CONFIGURE)
 	ioext = extent_create("pciio", 0x100, S3C2800_PCI_IOSPACE_SIZE - 0x100,
-	    M_DEVBUF, NULL, 0, EX_NOWAIT);
+	    NULL, 0, EX_NOWAIT);
 
 	memext = extent_create("pcimem", 0, S3C2800_PCI_MEMSPACE_SIZE,
-	    M_DEVBUF, NULL, 0, EX_NOWAIT);
+	    NULL, 0, EX_NOWAIT);
 
 	sspci_chipset.pc_conf_v = (void *) sc;
 	sspci_chipset.pc_intr_v = (void *) sc;
Index: sys/arch/arm/xscale/becc_pci.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/becc_pci.c,v
retrieving revision 1.9
diff -u -r1.9 becc_pci.c
--- sys/arch/arm/xscale/becc_pci.c	4 Apr 2011 20:37:46 -0000	1.9
+++ sys/arch/arm/xscale/becc_pci.c	13 Apr 2011 20:00:25 -0000
@@ -125,10 +125,10 @@
 	/* Reserve the bottom 32K of the PCI address space. */
 	ioext  = extent_create("pciio", sc->sc_ioout_xlate + (32 * 1024),
 	    sc->sc_ioout_xlate + (64 * 1024) - 1,
-	    M_DEVBUF, NULL, 0, EX_NOWAIT);
+	    NULL, 0, EX_NOWAIT);
 	memext = extent_create("pcimem", sc->sc_owin_xlate[0],
 	    sc->sc_owin_xlate[0] + BECC_PCI_MEM1_SIZE - 1,
-	    M_DEVBUF, NULL, 0, EX_NOWAIT);
+	    NULL, 0, EX_NOWAIT);
 
 	aprint_normal("%s: configuring PCI bus\n", sc->sc_dev.dv_xname);
 	pci_configure_bus(pc, ioext, memext, NULL, 0, arm_dcache_align);
Index: sys/arch/arm/xscale/i80312_pci.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/i80312_pci.c,v
retrieving revision 1.9
diff -u -r1.9 i80312_pci.c
--- sys/arch/arm/xscale/i80312_pci.c	11 Dec 2005 12:16:51 -0000	1.9
+++ sys/arch/arm/xscale/i80312_pci.c	13 Apr 2011 20:00:25 -0000
@@ -108,10 +108,10 @@
 
 	ioext  = extent_create("pciio", sc->sc_sioout_base,
 	    sc->sc_sioout_base + sc->sc_sioout_size - 1,
-	    M_DEVBUF, NULL, 0, EX_NOWAIT);
+	    NULL, 0, EX_NOWAIT);
 	memext = extent_create("pcimem", sc->sc_smemout_base,
 	    sc->sc_smemout_base + sc->sc_smemout_size - 1,
-	    M_DEVBUF, NULL, 0, EX_NOWAIT);
+	    NULL, 0, EX_NOWAIT);
 
 	aprint_normal("%s: configuring Secondary PCI bus\n", sc->sc_dev.dv_xname);
 	pci_configure_bus(pc, ioext, memext, NULL, sbus, arm_dcache_align);
Index: sys/arch/arm/xscale/i80321_pci.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/i80321_pci.c,v
retrieving revision 1.9
diff -u -r1.9 i80321_pci.c
--- sys/arch/arm/xscale/i80321_pci.c	17 Oct 2007 19:53:43 -0000	1.9
+++ sys/arch/arm/xscale/i80321_pci.c	13 Apr 2011 20:00:26 -0000
@@ -110,16 +110,16 @@
 	ioext  = extent_create("pciio",
 	    sc->sc_ioout_xlate + sc->sc_ioout_xlate_offset,
 	    sc->sc_ioout_xlate + VERDE_OUT_XLATE_IO_WIN_SIZE - 1,
-	    M_DEVBUF, NULL, 0, EX_NOWAIT);
+	    NULL, 0, EX_NOWAIT);
 
 #ifdef I80321_USE_DIRECT_WIN
 	memext = extent_create("pcimem", VERDE_OUT_DIRECT_WIN_BASE + VERDE_OUT_DIRECT_WIN_SKIP,
 	    VERDE_OUT_DIRECT_WIN_BASE + VERDE_OUT_DIRECT_WIN_SIZE- 1,
-	    M_DEVBUF, NULL, 0, EX_NOWAIT);
+	    NULL, 0, EX_NOWAIT);
 #else
 	memext = extent_create("pcimem", sc->sc_owin[0].owin_xlate_lo,
 	    sc->sc_owin[0].owin_xlate_lo + VERDE_OUT_XLATE_MEM_WIN_SIZE - 1,
-	    M_DEVBUF, NULL, 0, EX_NOWAIT);
+	    NULL, 0, EX_NOWAIT);
 #endif
 
 	aprint_normal("%s: configuring PCI bus\n", sc->sc_dev.dv_xname);
Index: sys/arch/arm/xscale/ixp425_pci.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/ixp425_pci.c,v
retrieving revision 1.6
diff -u -r1.6 ixp425_pci.c
--- sys/arch/arm/xscale/ixp425_pci.c	21 Oct 2009 14:15:50 -0000	1.6
+++ sys/arch/arm/xscale/ixp425_pci.c	13 Apr 2011 20:00:26 -0000
@@ -89,12 +89,12 @@
 
 #if NPCI > 0 && defined(PCI_NETBSD_CONFIGURE)
 	ioext  = extent_create("pciio", 0, IXP425_PCI_IO_SIZE - 1,
-				M_DEVBUF, NULL, 0, EX_NOWAIT);
+				NULL, 0, EX_NOWAIT);
 	/* PCI MEM space is mapped same address as real memory */
 	memext = extent_create("pcimem", IXP425_PCI_MEM_HWBASE,
 				IXP425_PCI_MEM_HWBASE +
 				IXP425_PCI_MEM_SIZE - 1,
-				M_DEVBUF, NULL, 0, EX_NOWAIT);
+				NULL, 0, EX_NOWAIT);
 	printf("%s: configuring PCI bus\n", sc->sc_dev.dv_xname);
 	pci_configure_bus(pc, ioext, memext, NULL, 0 /* XXX bus = 0 */,
 			  arm_dcache_align);
Index: sys/arch/atari/atari/atari_init.c
===================================================================
RCS file: /cvsroot/src/sys/arch/atari/atari/atari_init.c,v
retrieving revision 1.95
diff -u -r1.95 atari_init.c
--- sys/arch/atari/atari/atari_init.c	2 Jan 2011 18:48:05 -0000	1.95
+++ sys/arch/atari/atari/atari_init.c	13 Apr 2011 20:00:27 -0000
@@ -587,7 +587,7 @@
 	 * on the machine.  When the amount of RAM is found, all
 	 * extents of RAM are allocated from the map.
 	 */
-	iomem_ex = extent_create("iomem", 0x0, 0xffffffff, M_DEVBUF,
+	iomem_ex = extent_create("iomem", 0x0, 0xffffffff,
 	    (void *)iomem_ex_storage, sizeof(iomem_ex_storage),
 	    EX_NOCOALESCE|EX_NOWAIT);
 
Index: sys/arch/atari/atari/bus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/atari/atari/bus.c,v
retrieving revision 1.55
diff -u -r1.55 bus.c
--- sys/arch/atari/atari/bus.c	6 Nov 2010 11:46:00 -0000	1.55
+++ sys/arch/atari/atari/bus.c	13 Apr 2011 20:00:27 -0000
@@ -86,7 +86,7 @@
 void
 bootm_init(vaddr_t va, pt_entry_t *ptep, u_long size)
 {
-	bootm_ex = extent_create("bootmem", va, va + size, M_DEVBUF,
+	bootm_ex = extent_create("bootmem", va, va + size,
 	    (void *)bootm_ex_storage, sizeof(bootm_ex_storage),
 	    EX_NOCOALESCE|EX_NOWAIT);
 	bootm_ptep = ptep;
Index: sys/arch/bebox/bebox/mainbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/bebox/bebox/mainbus.c,v
retrieving revision 1.24
diff -u -r1.24 mainbus.c
--- sys/arch/bebox/bebox/mainbus.c	18 Mar 2009 16:00:10 -0000	1.24
+++ sys/arch/bebox/bebox/mainbus.c	13 Apr 2011 20:00:28 -0000
@@ -132,9 +132,9 @@
 	SIMPLEQ_INSERT_TAIL(&genppc_pct->pc_pbi, pbi, next);
 
 #ifdef PCI_NETBSD_CONFIGURE
-	ioext  = extent_create("pciio",  0x00008000, 0x0000ffff, M_DEVBUF,
+	ioext  = extent_create("pciio",  0x00008000, 0x0000ffff,
 	    NULL, 0, EX_NOWAIT);
-	memext = extent_create("pcimem", 0x00000000, 0x0fffffff, M_DEVBUF,
+	memext = extent_create("pcimem", 0x00000000, 0x0fffffff,
 	    NULL, 0, EX_NOWAIT);
 
 	pci_configure_bus(genppc_pct, ioext, memext, NULL, 0, CACHELINESIZE);
Index: sys/arch/cobalt/dev/gt.c
===================================================================
RCS file: /cvsroot/src/sys/arch/cobalt/dev/gt.c,v
retrieving revision 1.23
diff -u -r1.23 gt.c
--- sys/arch/cobalt/dev/gt.c	20 Feb 2011 07:54:11 -0000	1.23
+++ sys/arch/cobalt/dev/gt.c	13 Apr 2011 20:00:28 -0000
@@ -127,9 +127,9 @@
 
 #ifdef PCI_NETBSD_CONFIGURE
 	pc->pc_ioext = extent_create("pciio", 0x10001000, 0x11ffffff,
-	    M_DEVBUF, NULL, 0, EX_NOWAIT);
+	    NULL, 0, EX_NOWAIT);
 	pc->pc_memext = extent_create("pcimem", 0x12000000, 0x13ffffff,
-	    M_DEVBUF, NULL, 0, EX_NOWAIT);
+	    NULL, 0, EX_NOWAIT);
 	pci_configure_bus(pc, pc->pc_ioext, pc->pc_memext, NULL, 0,
 	    mips_cache_info.mci_dcache_align);
 #endif
Index: sys/arch/dreamcast/dev/g2/gapspci_dma.c
===================================================================
RCS file: /cvsroot/src/sys/arch/dreamcast/dev/g2/gapspci_dma.c,v
retrieving revision 1.18
diff -u -r1.18 gapspci_dma.c
--- sys/arch/dreamcast/dev/g2/gapspci_dma.c	12 Nov 2010 13:18:56 -0000	1.18
+++ sys/arch/dreamcast/dev/g2/gapspci_dma.c	13 Apr 2011 20:00:28 -0000
@@ -109,7 +109,7 @@
 	 */
 	sc->sc_dma_ex = extent_create("gaps dma",
 	    sc->sc_dmabase, sc->sc_dmabase + (sc->sc_dmasize - 1),
-	    M_DEVBUF, NULL, 0, EX_WAITOK | EXF_NOCOALESCE);
+	    NULL, 0, EX_WAITOK | EXF_NOCOALESCE);
 
 	if (bus_space_map(sc->sc_memt, sc->sc_dmabase, sc->sc_dmasize,
 	    0, &sc->sc_dma_memh) != 0)
Index: sys/arch/emips/emips/machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/emips/emips/machdep.c,v
retrieving revision 1.4
diff -u -r1.4 machdep.c
--- sys/arch/emips/emips/machdep.c	22 Feb 2011 08:20:20 -0000	1.4
+++ sys/arch/emips/emips/machdep.c	13 Apr 2011 20:00:32 -0000
@@ -341,7 +341,7 @@
 	 */
 	KASSERT(iospace != 0);
 	iomap_ex = extent_create("iomap", iospace,
-	    iospace + iospace_size - 1, M_DEVBUF,
+	    iospace + iospace_size - 1,
 	    (void *) iomap_ex_storage, sizeof(iomap_ex_storage),
 	    EX_NOCOALESCE|EX_NOWAIT);
 
Index: sys/arch/evbarm/ifpga/ifpga.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/ifpga/ifpga.c,v
retrieving revision 1.23
diff -u -r1.23 ifpga.c
--- sys/arch/evbarm/ifpga/ifpga.c	21 Jul 2009 16:04:16 -0000	1.23
+++ sys/arch/evbarm/ifpga/ifpga.c	13 Apr 2011 20:00:34 -0000
@@ -296,13 +296,13 @@
 
 #if defined(PCI_NETBSD_CONFIGURE)
 	ioext = extent_create("pciio", 0x00000000,
-	    0x00000000 + IFPGA_PCI_IO_VSIZE, M_DEVBUF, NULL, 0, EX_NOWAIT);
+	    0x00000000 + IFPGA_PCI_IO_VSIZE, NULL, 0, EX_NOWAIT);
 	memext = extent_create("pcimem", IFPGA_PCI_APP0_BASE,
 	    IFPGA_PCI_APP0_BASE + IFPGA_PCI_APP0_SIZE,
-	    M_DEVBUF, NULL, 0, EX_NOWAIT);
+	    NULL, 0, EX_NOWAIT);
 	pmemext = extent_create("pcipmem", IFPGA_PCI_APP1_BASE,
 	    IFPGA_PCI_APP1_BASE + IFPGA_PCI_APP1_SIZE,
-	    M_DEVBUF, NULL, 0, EX_NOWAIT);
+	    NULL, 0, EX_NOWAIT);
 	ifpga_pci_chipset.pc_conf_v = (void *)pci_sc;
 	pci_configure_bus(&ifpga_pci_chipset, ioext, memext, pmemext, 0,
 	    arm_dcache_align);
Index: sys/arch/evbarm/tsarm/isa/isa_io.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/tsarm/isa/isa_io.c,v
retrieving revision 1.7
diff -u -r1.7 isa_io.c
--- sys/arch/evbarm/tsarm/isa/isa_io.c	14 Mar 2009 21:04:08 -0000	1.7
+++ sys/arch/evbarm/tsarm/isa/isa_io.c	13 Apr 2011 20:00:35 -0000
@@ -242,10 +242,10 @@
 	isa_io_bs_tag.bs_cookie = (void *)isa_io_addr;
 	isa_mem_bs_tag.bs_cookie = (void *)isa_mem_addr;
 
-	isaio_ex = extent_create("isaio", 0x0, 0xffff, M_DEVBUF, 
+	isaio_ex = extent_create("isaio", 0x0, 0xffff, 
 		(void *)isaio_ex_storage, sizeof(isaio_ex_storage),
 		EX_NOWAIT|EX_NOCOALESCE);
-	isamem_ex = extent_create("isamem", 0x0, 0xfffff, M_DEVBUF, 
+	isamem_ex = extent_create("isamem", 0x0, 0xfffff, 
 		(void *)isamem_ex_storage, sizeof(isamem_ex_storage),
 		EX_NOWAIT|EX_NOCOALESCE);
 	if (isaio_ex == NULL || isamem_ex == NULL)
Index: sys/arch/evbmips/gdium/mainbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbmips/gdium/mainbus.c,v
retrieving revision 1.3
diff -u -r1.3 mainbus.c
--- sys/arch/evbmips/gdium/mainbus.c	11 Aug 2009 02:32:38 -0000	1.3
+++ sys/arch/evbmips/gdium/mainbus.c	13 Apr 2011 20:00:35 -0000
@@ -103,9 +103,9 @@
 		struct extent *ioext, *memext;
 
 		ioext = extent_create("pciio",  0x00001000, 0x00003fff,
-		    M_DEVBUF, NULL, 0, EX_NOWAIT);
+		    NULL, 0, EX_NOWAIT);
 		memext = extent_create("pcimem", 0, BONITO_PCILO_SIZE,
-		    M_DEVBUF, NULL, 0, EX_NOWAIT);
+		    NULL, 0, EX_NOWAIT);
 
 		pci_configure_bus(&gdium_configuration.gc_pc, ioext, memext,
 		    NULL, 0, mips_dcache_align);
Index: sys/arch/evbmips/rmixl/machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbmips/rmixl/machdep.c,v
retrieving revision 1.9
diff -u -r1.9 machdep.c
--- sys/arch/evbmips/rmixl/machdep.c	12 Apr 2011 00:21:10 -0000	1.9
+++ sys/arch/evbmips/rmixl/machdep.c	13 Apr 2011 20:00:36 -0000
@@ -611,7 +611,7 @@
 	u_long size;
 	uint32_t r;
 
-	ext = extent_create("physaddr", start, end, M_DEVBUF,
+	ext = extent_create("physaddr", start, end,
 		(void *)rmixl_physaddr_storage, sizeof(rmixl_physaddr_storage),
 		EX_NOWAIT | EX_NOCOALESCE);
 
Index: sys/arch/evbppc/mpc85xx/machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbppc/mpc85xx/machdep.c,v
retrieving revision 1.5
diff -u -r1.5 machdep.c
--- sys/arch/evbppc/mpc85xx/machdep.c	17 Feb 2011 13:57:12 -0000	1.5
+++ sys/arch/evbppc/mpc85xx/machdep.c	13 Apr 2011 20:00:37 -0000
@@ -993,12 +993,12 @@
 #if NPCI > 0 && defined(PCI_MEMBASE)
 	pcimem_ex = extent_create("pcimem",
 	    PCI_MEMBASE, PCI_MEMBASE + 4*PCI_MEMSIZE,
-	    M_DEVBUF, NULL, 0, EX_WAITOK);
+	    NULL, 0, EX_WAITOK);
 #endif
 #if NPCI > 0 && defined(PCI_IOBASE)
 	pciio_ex = extent_create("pciio",
 	    PCI_IOBASE, PCI_IOBASE + 4*PCI_IOSIZE,
-	    M_DEVBUF, NULL, 0, EX_WAITOK);
+	    NULL, 0, EX_WAITOK);
 #endif
 	mpc85xx_extirq_setup();
 	/*
Index: sys/arch/ews4800mips/ews4800mips/bus_space.c
===================================================================
RCS file: /cvsroot/src/sys/arch/ews4800mips/ews4800mips/bus_space.c,v
retrieving revision 1.4
diff -u -r1.4 bus_space.c
--- sys/arch/ews4800mips/ews4800mips/bus_space.c	28 Apr 2008 20:23:18 -0000	1.4
+++ sys/arch/ews4800mips/ews4800mips/bus_space.c	13 Apr 2011 20:00:43 -0000
@@ -166,7 +166,7 @@
 		ebs->ebs_size = size;
 	} else {
 		ebs->ebs_extent = extent_create(name, addr, addr + size - 1,
-		    M_DEVBUF, 0, 0, EX_NOWAIT);
+		    0, 0, EX_NOWAIT);
 		if (ebs->ebs_extent == NULL) {
 			panic("%s:: unable to create bus_space for "
 			    "0x%08lx-%#lx", __func__, addr, size);
Index: sys/arch/hp300/hp300/autoconf.c
===================================================================
RCS file: /cvsroot/src/sys/arch/hp300/hp300/autoconf.c,v
retrieving revision 1.97
diff -u -r1.97 autoconf.c
--- sys/arch/hp300/hp300/autoconf.c	12 Feb 2011 05:08:40 -0000	1.97
+++ sys/arch/hp300/hp300/autoconf.c	13 Apr 2011 20:00:45 -0000
@@ -897,7 +897,7 @@
 
 	/* extiobase is initialized by pmap_bootstrap(). */
 	extio_ex = extent_create("extio", (u_long) extiobase,
-	    (u_long) extiobase + (ptoa(EIOMAPSIZE) - 1), M_DEVBUF,
+	    (u_long) extiobase + (ptoa(EIOMAPSIZE) - 1),
 	    (void *) extio_ex_storage, sizeof(extio_ex_storage),
 	    EX_NOCOALESCE|EX_NOWAIT);
 }
Index: sys/arch/hp700/dev/astro.c
===================================================================
RCS file: /cvsroot/src/sys/arch/hp700/dev/astro.c,v
retrieving revision 1.13
diff -u -r1.13 astro.c
--- sys/arch/hp700/dev/astro.c	13 Jan 2011 21:15:13 -0000	1.13
+++ sys/arch/hp700/dev/astro.c	13 Apr 2011 20:00:47 -0000
@@ -328,7 +328,7 @@
 	snprintf(sc->sc_dvmamapname, sizeof(sc->sc_dvmamapname),
 	    "%s_dvma", device_xname(sc->sc_dv));
 	sc->sc_dvmamap = extent_create(sc->sc_dvmamapname, 0, (1 << iova_bits),
-	    M_DEVBUF, 0, 0, EX_NOWAIT);
+	    0, 0, EX_NOWAIT);
 
 	sc->sc_dmatag = astro_dmat;
 	sc->sc_dmatag._cookie = sc;
Index: sys/arch/hp700/dev/dino.c
===================================================================
RCS file: /cvsroot/src/sys/arch/hp700/dev/dino.c,v
retrieving revision 1.31
diff -u -r1.31 dino.c
--- sys/arch/hp700/dev/dino.c	4 Apr 2011 20:37:50 -0000	1.31
+++ sys/arch/hp700/dev/dino.c	13 Apr 2011 20:00:48 -0000
@@ -1643,7 +1643,7 @@
 	snprintf(sc->sc_ioexname, sizeof(sc->sc_ioexname),
 	    "%s_io", device_xname(self));
 	if ((sc->sc_ioex = extent_create(sc->sc_ioexname, 0, 0xffff,
-	    M_DEVBUF, NULL, 0, EX_NOWAIT | EX_MALLOCOK)) == NULL) {
+	    NULL, 0, EX_NOWAIT | EX_MALLOCOK)) == NULL) {
 		aprint_error(": can't allocate I/O extent map\n");
 		bus_space_unmap(sc->sc_bt, sc->sc_bh, PAGE_SIZE);
 		return;
Index: sys/arch/hp700/dev/elroy.c
===================================================================
RCS file: /cvsroot/src/sys/arch/hp700/dev/elroy.c,v
retrieving revision 1.10
diff -u -r1.10 elroy.c
--- sys/arch/hp700/dev/elroy.c	8 Nov 2010 23:10:24 -0000	1.10
+++ sys/arch/hp700/dev/elroy.c	13 Apr 2011 20:00:50 -0000
@@ -454,7 +454,7 @@
 			snprintf(sc->sc_memexname, sizeof(sc->sc_memexname),
 			    "%s_mem", sc->sc_dv.dv_xname);
 			if ((sc->sc_memex = extent_create(sc->sc_memexname,
-			    mem_start, mem_start + ELROY_MEM_WINDOW, M_DEVBUF,
+			    mem_start, mem_start + ELROY_MEM_WINDOW,
 			    NULL, 0, EX_NOWAIT | EX_MALLOCOK)) == NULL) {
 				extent_destroy(sc->sc_ioex);
 				bus_space_free(sc->sc_bt, memh,
Index: sys/arch/hp700/hp700/machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/hp700/hp700/machdep.c,v
retrieving revision 1.99
diff -u -r1.99 machdep.c
--- sys/arch/hp700/hp700/machdep.c	4 Mar 2011 22:25:26 -0000	1.99
+++ sys/arch/hp700/hp700/machdep.c	13 Apr 2011 20:00:51 -0000
@@ -517,7 +517,7 @@
 
 	/* we hope this won't fail */
 	hp700_io_extent = extent_create("io",
-	    HPPA_IOSPACE, 0xffffffff, M_DEVBUF,
+	    HPPA_IOSPACE, 0xffffffff,
 	    (void *)hp700_io_extent_store, sizeof(hp700_io_extent_store),
 	    EX_NOCOALESCE|EX_NOWAIT);
 
Index: sys/arch/hpcmips/hpcmips/bus_space.c
===================================================================
RCS file: /cvsroot/src/sys/arch/hpcmips/hpcmips/bus_space.c,v
retrieving revision 1.30
diff -u -r1.30 bus_space.c
--- sys/arch/hpcmips/hpcmips/bus_space.c	26 Feb 2011 12:07:45 -0000	1.30
+++ sys/arch/hpcmips/hpcmips/bus_space.c	13 Apr 2011 20:00:53 -0000
@@ -216,7 +216,7 @@
 	}
 
 	t->extent = (void*)extent_create(t->name, t->base, 
-	    t->base + t->size, M_DEVBUF,
+	    t->base + t->size,
 	    0, 0, EX_NOWAIT);
 	if (!t->extent) {
 		panic("hpcmips_init_bus_space_extent:"
Index: sys/arch/hpcmips/tx/tx3912video.c
===================================================================
RCS file: /cvsroot/src/sys/arch/hpcmips/tx/tx3912video.c,v
retrieving revision 1.40
diff -u -r1.40 tx3912video.c
--- sys/arch/hpcmips/tx/tx3912video.c	14 Mar 2009 15:36:07 -0000	1.40
+++ sys/arch/hpcmips/tx/tx3912video.c	13 Apr 2011 20:00:54 -0000
@@ -366,7 +366,7 @@
 
 	/* extent V-RAM region */
 	ex = extent_create("Frame buffer address", fb_start, *fb_end,
-	    0, (void *)ex_fixed, sizeof ex_fixed,
+	    (void *)ex_fixed, sizeof ex_fixed,
 	    EX_NOWAIT);
 	if (ex == 0)
 		return (1);
Index: sys/arch/hpcsh/hpcsh/bus_space.c
===================================================================
RCS file: /cvsroot/src/sys/arch/hpcsh/hpcsh/bus_space.c,v
retrieving revision 1.16
diff -u -r1.16 bus_space.c
--- sys/arch/hpcsh/hpcsh/bus_space.c	28 Jun 2010 11:18:44 -0000	1.16
+++ sys/arch/hpcsh/hpcsh/bus_space.c	13 Apr 2011 20:00:55 -0000
@@ -155,7 +155,7 @@
 		hbs->hbs_base_addr = addr; /* no extent */
 	} else {
 		hbs->hbs_extent = extent_create(name, addr, addr + size - 1,
-						M_DEVBUF, 0, 0, EX_NOWAIT);
+						0, 0, EX_NOWAIT);
 		if (hbs->hbs_extent == NULL) {
 			panic("%s:: unable to create bus_space for "
 			      "0x%08lx-%#lx", __func__, addr, size);
Index: sys/arch/ibmnws/ibmnws/mainbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/ibmnws/ibmnws/mainbus.c,v
retrieving revision 1.8
diff -u -r1.8 mainbus.c
--- sys/arch/ibmnws/ibmnws/mainbus.c	18 Mar 2009 16:00:13 -0000	1.8
+++ sys/arch/ibmnws/ibmnws/mainbus.c	13 Apr 2011 20:00:56 -0000
@@ -124,9 +124,9 @@
 	ibmnws_pci_get_chipset_tag_indirect (genppc_pct);
 
 #ifdef PCI_NETBSD_CONFIGURE
-	ioext  = extent_create("pciio",  0x00008000, 0x0000ffff, M_DEVBUF,
+	ioext  = extent_create("pciio",  0x00008000, 0x0000ffff,
 	    NULL, 0, EX_NOWAIT);
-	memext = extent_create("pcimem", 0x00000000, 0x0fffffff, M_DEVBUF,
+	memext = extent_create("pcimem", 0x00000000, 0x0fffffff,
 	    NULL, 0, EX_NOWAIT);
 
 	pci_configure_bus(genppc_pct, ioext, memext, NULL, 0, CACHELINESIZE);
Index: sys/arch/mac68k/mac68k/machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mac68k/mac68k/machdep.c,v
retrieving revision 1.339
diff -u -r1.339 machdep.c
--- sys/arch/mac68k/mac68k/machdep.c	4 Mar 2011 22:25:27 -0000	1.339
+++ sys/arch/mac68k/mac68k/machdep.c	13 Apr 2011 20:00:59 -0000
@@ -277,7 +277,7 @@
 	 * on the machine.  When the amount of RAM is found, all
 	 * extents of RAM are allocated from the map.
 	 */
-	iomem_ex = extent_create("iomem", 0x0, 0xffffffff, M_DEVBUF,
+	iomem_ex = extent_create("iomem", 0x0, 0xffffffff,
 	    (void *)iomem_ex_storage, sizeof(iomem_ex_storage),
 	    EX_NOCOALESCE|EX_NOWAIT);
 
Index: sys/arch/mips/alchemy/au_himem_space.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/alchemy/au_himem_space.c,v
retrieving revision 1.11
diff -u -r1.11 au_himem_space.c
--- sys/arch/mips/alchemy/au_himem_space.c	7 Jun 2010 13:33:33 -0000	1.11
+++ sys/arch/mips/alchemy/au_himem_space.c	13 Apr 2011 20:01:01 -0000
@@ -701,7 +701,7 @@
 	c->c_physoff = physoff;
 
 	/* allocate extent manager */
-	c->c_extent = extent_create(name, start, end, M_DEVBUF,
+	c->c_extent = extent_create(name, start, end,
 	    NULL, 0, EX_NOWAIT);
 	if (c->c_extent == NULL)
 		panic("au_himem_space_init: %s: cannot create extent", name);
Index: sys/arch/mips/alchemy/au_wired_space.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/alchemy/au_wired_space.c,v
retrieving revision 1.6
diff -u -r1.6 au_wired_space.c
--- sys/arch/mips/alchemy/au_wired_space.c	28 Apr 2008 20:23:27 -0000	1.6
+++ sys/arch/mips/alchemy/au_wired_space.c	13 Apr 2011 20:01:01 -0000
@@ -641,7 +641,7 @@
 	c->c_size = size;
 
 	/* allocate extent manager */
-	c->c_extent = extent_create(name, start, start + size, M_DEVBUF,
+	c->c_extent = extent_create(name, start, start + size, 
 	    (void *)c->c_exstore, sizeof (c->c_exstore), EX_NOWAIT);
 	if (c->c_extent == NULL)
 		panic("au_wired_space_init: %s: cannot create extent", name);
Index: sys/arch/mips/alchemy/dev/aupci.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/alchemy/dev/aupci.c,v
retrieving revision 1.9
diff -u -r1.9 aupci.c
--- sys/arch/mips/alchemy/dev/aupci.c	20 Feb 2011 07:48:36 -0000	1.9
+++ sys/arch/mips/alchemy/dev/aupci.c	13 Apr 2011 20:01:02 -0000
@@ -264,10 +264,10 @@
 
 #ifdef PCI_NETBSD_CONFIGURE
 	mem_ex = extent_create("pcimem", mstart, 0xffffffff,
-	    M_DEVBUF, NULL, 0, EX_WAITOK);
+	    NULL, 0, EX_WAITOK);
 
 	io_ex = extent_create("pciio", AUPCI_IO_START, AUPCI_IO_END,
-	    M_DEVBUF, NULL, 0, EX_WAITOK);
+	    NULL, 0, EX_WAITOK);
 
 	pci_configure_bus(&sc->sc_pc,
 	    io_ex, mem_ex, NULL, 0, mips_cache_info.mci_dcache_align);
Index: sys/arch/mips/mips/bus_space_alignstride_chipdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c,v
retrieving revision 1.13
diff -u -r1.13 bus_space_alignstride_chipdep.c
--- sys/arch/mips/mips/bus_space_alignstride_chipdep.c	20 Feb 2011 07:45:47 -0000	1.13
+++ sys/arch/mips/mips/bus_space_alignstride_chipdep.c	13 Apr 2011 20:01:03 -0000
@@ -552,7 +552,7 @@
 
 #ifdef CHIP_EXTENT
 	/* XXX WE WANT EXTENT_NOCOALESCE, BUT WE CAN'T USE IT. XXX */
-	ex = extent_create(__S(__BS(bus)), 0x0UL, ~0UL, M_DEVBUF,
+	ex = extent_create(__S(__BS(bus)), 0x0UL, ~0UL, 
 	    (void *)CHIP_EX_STORE(v), CHIP_EX_STORE_SIZE(v), EX_NOWAIT);
 	extent_alloc_region(ex, 0, ~0UL, EX_NOWAIT);
 
Index: sys/arch/mips/mips/pmap.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/mips/pmap.c,v
retrieving revision 1.198
diff -u -r1.198 pmap.c
--- sys/arch/mips/mips/pmap.c	15 Mar 2011 07:31:33 -0000	1.198
+++ sys/arch/mips/mips/pmap.c	13 Apr 2011 20:01:09 -0000
@@ -498,7 +498,7 @@
 	/*
 	 * Compute the number of pages kmem_map will have.
 	 */
-	kmeminit_nkmempages();
+	uvm_km_setupkmemsize();
 
 	/*
 	 * Figure out how many PTE's are necessary to map the kernel.
Index: sys/arch/mips/rmi/rmixl_pcie.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/rmi/rmixl_pcie.c,v
retrieving revision 1.4
diff -u -r1.4 rmixl_pcie.c
--- sys/arch/mips/rmi/rmixl_pcie.c	4 Apr 2011 20:37:52 -0000	1.4
+++ sys/arch/mips/rmi/rmixl_pcie.c	13 Apr 2011 20:01:10 -0000
@@ -706,12 +706,12 @@
 	ioext  = extent_create("pciio",
 		rcp->rc_pci_io_pbase,
 		rcp->rc_pci_io_pbase + rcp->rc_pci_io_size - 1,
-		M_DEVBUF, NULL, 0, EX_NOWAIT);
+		NULL, 0, EX_NOWAIT);
 
 	memext = extent_create("pcimem",
 		rcp->rc_pci_mem_pbase,
 		rcp->rc_pci_mem_pbase + rcp->rc_pci_mem_size - 1,
-		M_DEVBUF, NULL, 0, EX_NOWAIT);
+		NULL, 0, EX_NOWAIT);
 
 	pci_configure_bus(pc, ioext, memext, NULL, 0,
 	    mips_cache_info.mci_dcache_align);
Index: sys/arch/mipsco/mipsco/bus_space.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mipsco/mipsco/bus_space.c,v
retrieving revision 1.11
diff -u -r1.11 bus_space.c
--- sys/arch/mipsco/mipsco/bus_space.c	18 Mar 2009 10:22:32 -0000	1.11
+++ sys/arch/mipsco/mipsco/bus_space.c	13 Apr 2011 20:01:10 -0000
@@ -69,7 +69,7 @@
 mipsco_bus_space_init_extent(bus_space_tag_t bst, void *storage, size_t storagesize)
 {
 	bst->bs_extent = extent_create(bst->bs_name,
-	    bst->bs_start, bst->bs_start + bst->bs_size, M_DEVBUF,
+	    bst->bs_start, bst->bs_start + bst->bs_size,
 	    storage, storagesize, EX_NOWAIT);
 	if (bst->bs_extent == NULL)
 	    panic("mipsco_bus_space_init_extent: cannot create extent map %s",
Index: sys/arch/mvmeppc/mvmeppc/mainbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mvmeppc/mvmeppc/mainbus.c,v
retrieving revision 1.11
diff -u -r1.11 mainbus.c
--- sys/arch/mvmeppc/mvmeppc/mainbus.c	14 Mar 2009 15:36:11 -0000	1.11
+++ sys/arch/mvmeppc/mvmeppc/mainbus.c	13 Apr 2011 20:01:11 -0000
@@ -118,9 +118,9 @@
 	SIMPLEQ_INSERT_TAIL(&genppc_pct->pc_pbi, pbi, next);
 
 #ifdef PCI_NETBSD_CONFIGURE
-	ioext  = extent_create("pciio",  0x00008000, 0x0000ffff, M_DEVBUF,
+	ioext  = extent_create("pciio",  0x00008000, 0x0000ffff,
 	    NULL, 0, EX_NOWAIT);
-	memext = extent_create("pcimem", 0x00000000, 0x0fffffff, M_DEVBUF,
+	memext = extent_create("pcimem", 0x00000000, 0x0fffffff,
 	    NULL, 0, EX_NOWAIT);
 
 	pci_configure_bus(0, ioext, memext, NULL, 0, 32);
Index: sys/arch/ofppc/pci/ofwpci.c
===================================================================
RCS file: /cvsroot/src/sys/arch/ofppc/pci/ofwpci.c,v
retrieving revision 1.8
diff -u -r1.8 ofwpci.c
--- sys/arch/ofppc/pci/ofwpci.c	28 Apr 2008 20:23:31 -0000	1.8
+++ sys/arch/ofppc/pci/ofwpci.c	13 Apr 2011 20:01:11 -0000
@@ -200,9 +200,9 @@
 	ioext  = extent_create("pciio",
 	    modeldata.pciiodata[device_unit(self)].start,
 	    modeldata.pciiodata[device_unit(self)].limit,
-	    M_DEVBUF, NULL, 0, EX_NOWAIT);
+	    NULL, 0, EX_NOWAIT);
 	memext = extent_create("pcimem", sc->sc_memt.pbs_base,
-	    sc->sc_memt.pbs_limit-1, M_DEVBUF, NULL, 0, EX_NOWAIT);
+	    sc->sc_memt.pbs_limit-1, NULL, 0, EX_NOWAIT);
 
 	if (pci_configure_bus(pc, ioext, memext, NULL, 0, CACHELINESIZE))
 		aprint_error("pci_configure_bus() failed\n");
Index: sys/arch/powerpc/ibm4xx/pci/pchb.c
===================================================================
RCS file: /cvsroot/src/sys/arch/powerpc/ibm4xx/pci/pchb.c,v
retrieving revision 1.6
diff -u -r1.6 pchb.c
--- sys/arch/powerpc/ibm4xx/pci/pchb.c	4 May 2008 00:08:45 -0000	1.6
+++ sys/arch/powerpc/ibm4xx/pci/pchb.c	13 Apr 2011 20:01:11 -0000
@@ -160,10 +160,9 @@
 
 #ifdef PCI_NETBSD_CONFIGURE
 	pc->memext = extent_create("pcimem", IBM405GP_PCI_MEM_START,
-	    IBM405GP_PCI_MEM_START + 0x1fffffff, M_DEVBUF, NULL, 0,
-	    EX_NOWAIT);
+	    IBM405GP_PCI_MEM_START + 0x1fffffff, NULL, 0, EX_NOWAIT);
 	pc->ioext = extent_create("pciio", IBM405GP_PCI_PCI_IO_START,
-	    IBM405GP_PCI_PCI_IO_START + 0xffff, M_DEVBUF, NULL, 0, EX_NOWAIT);
+	    IBM405GP_PCI_PCI_IO_START + 0xffff, NULL, 0, EX_NOWAIT);
 	pci_configure_bus(pc, pc->ioext, pc->memext, NULL, 0, 32);
 #endif /* PCI_NETBSD_CONFIGURE */
 
Index: sys/arch/powerpc/powerpc/bus_space.c
===================================================================
RCS file: /cvsroot/src/sys/arch/powerpc/powerpc/bus_space.c,v
retrieving revision 1.26
diff -u -r1.26 bus_space.c
--- sys/arch/powerpc/powerpc/bus_space.c	5 Mar 2011 15:25:52 -0000	1.26
+++ sys/arch/powerpc/powerpc/bus_space.c	13 Apr 2011 20:01:12 -0000
@@ -403,7 +403,7 @@
 {
 	if (t->pbs_extent == NULL && extent_name != NULL) {
 		t->pbs_extent = extent_create(extent_name, t->pbs_base,
-		    t->pbs_limit-1, M_DEVBUF, storage, storage_size,
+		    t->pbs_limit-1, storage, storage_size,
 		    EX_NOCOALESCE|EX_NOWAIT);
 		if (t->pbs_extent == NULL)
 			return ENOMEM;
Index: sys/arch/prep/prep/mainbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/prep/prep/mainbus.c,v
retrieving revision 1.29
diff -u -r1.29 mainbus.c
--- sys/arch/prep/prep/mainbus.c	18 Mar 2009 16:00:14 -0000	1.29
+++ sys/arch/prep/prep/mainbus.c	13 Apr 2011 20:01:12 -0000
@@ -144,9 +144,9 @@
 	setup_pciintr_map(pbi, 0, 0, 0);
 
 #ifdef PCI_NETBSD_CONFIGURE
-	ioext  = extent_create("pciio",  0x00008000, 0x0000ffff, M_DEVBUF,
+	ioext  = extent_create("pciio",  0x00008000, 0x0000ffff,
 	    NULL, 0, EX_NOWAIT);
-	memext = extent_create("pcimem", 0x00000000, 0x0fffffff, M_DEVBUF,
+	memext = extent_create("pcimem", 0x00000000, 0x0fffffff,
 	    NULL, 0, EX_NOWAIT);
 
 	pci_configure_bus(genppc_pct, ioext, memext, NULL, 0, CACHELINESIZE);
Index: sys/arch/sandpoint/sandpoint/mainbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sandpoint/sandpoint/mainbus.c,v
retrieving revision 1.21
diff -u -r1.21 mainbus.c
--- sys/arch/sandpoint/sandpoint/mainbus.c	14 Mar 2009 21:04:15 -0000	1.21
+++ sys/arch/sandpoint/sandpoint/mainbus.c	13 Apr 2011 20:01:13 -0000
@@ -98,9 +98,9 @@
 	 */
 #if NPCI > 0
 #if defined(PCI_NETBSD_CONFIGURE)
-	ioext  = extent_create("pciio",  0x00001000, 0x0000ffff, M_DEVBUF,
+	ioext  = extent_create("pciio",  0x00001000, 0x0000ffff,
 	    NULL, 0, EX_NOWAIT);
-	memext = extent_create("pcimem", 0x80000000, 0x8fffffff, M_DEVBUF,
+	memext = extent_create("pcimem", 0x80000000, 0x8fffffff,
 	    NULL, 0, EX_NOWAIT);
 
 	pci_configure_bus(0, ioext, memext, NULL, 0, 32);
Index: sys/arch/sgimips/gio/pci_gio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sgimips/gio/pci_gio.c,v
retrieving revision 1.6
diff -u -r1.6 pci_gio.c
--- sys/arch/sgimips/gio/pci_gio.c	20 Feb 2011 07:59:50 -0000	1.6
+++ sys/arch/sgimips/gio/pci_gio.c	13 Apr 2011 20:01:13 -0000
@@ -213,7 +213,7 @@
 
 #ifdef PCI_NETBSD_CONFIGURE
 	pc->pc_memext = extent_create("giopcimem", m_start, m_end,
-	    M_DEVBUF, NULL, 0, EX_NOWAIT);
+	    NULL, 0, EX_NOWAIT);
 	pci_configure_bus(pc, NULL, pc->pc_memext, NULL, 0,
 	    mips_cache_info.mci_dcache_align);
 #endif
Index: sys/arch/sgimips/mace/pci_mace.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sgimips/mace/pci_mace.c,v
retrieving revision 1.10
diff -u -r1.10 pci_mace.c
--- sys/arch/sgimips/mace/pci_mace.c	20 Feb 2011 07:59:51 -0000	1.10
+++ sys/arch/sgimips/mace/pci_mace.c	13 Apr 2011 20:01:13 -0000
@@ -145,9 +145,9 @@
 
 #if NPCI > 0
 	pc->pc_ioext = extent_create("macepciio", 0x00001000, 0x01ffffff,
-	    M_DEVBUF, NULL, 0, EX_NOWAIT);
+	    NULL, 0, EX_NOWAIT);
 	pc->pc_memext = extent_create("macepcimem", 0x80100000, 0x81ffffff,
-	    M_DEVBUF, NULL, 0, EX_NOWAIT);
+	    NULL, 0, EX_NOWAIT);
 	pci_configure_bus(pc, pc->pc_ioext, pc->pc_memext, NULL, 0,
 	    mips_cache_info.mci_dcache_align);
 	memset(&pba, 0, sizeof pba);
Index: sys/arch/sh3/dev/shpcic.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sh3/dev/shpcic.c,v
retrieving revision 1.13
diff -u -r1.13 shpcic.c
--- sys/arch/sh3/dev/shpcic.c	2 Aug 2009 00:06:44 -0000	1.13
+++ sys/arch/sh3/dev/shpcic.c	13 Apr 2011 20:01:14 -0000
@@ -228,10 +228,10 @@
 #ifdef PCI_NETBSD_CONFIGURE
 	ioext  = extent_create("pciio",
 	    SH4_PCIC_IO, SH4_PCIC_IO + SH4_PCIC_IO_SIZE - 1,
-	    M_DEVBUF, NULL, 0, EX_NOWAIT);
+	    NULL, 0, EX_NOWAIT);
 	memext = extent_create("pcimem",
 	    SH4_PCIC_MEM, SH4_PCIC_MEM + SH4_PCIC_MEM_SIZE - 1,
-	    M_DEVBUF, NULL, 0, EX_NOWAIT);
+	    NULL, 0, EX_NOWAIT);
 
 	pci_configure_bus(NULL, ioext, memext, NULL, 0, sh_cache_line_size);
 
Index: sys/arch/sparc/dev/vme_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/dev/vme_machdep.c,v
retrieving revision 1.63
diff -u -r1.63 vme_machdep.c
--- sys/arch/sparc/dev/vme_machdep.c	14 Jan 2011 02:06:31 -0000	1.63
+++ sys/arch/sparc/dev/vme_machdep.c	13 Apr 2011 20:01:15 -0000
@@ -316,7 +316,7 @@
 		sizeof(vmebus_translations)/sizeof(vmebus_translations[0]);
 
 	vme_dvmamap = extent_create("vmedvma", VME4_DVMA_BASE, VME4_DVMA_END,
-				    M_DEVBUF, 0, 0, EX_NOWAIT);
+				    0, 0, EX_NOWAIT);
 	if (vme_dvmamap == NULL)
 		panic("vme: unable to allocate DVMA map");
 
Index: sys/arch/sparc/sparc/iommu.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/sparc/iommu.c,v
retrieving revision 1.92
diff -u -r1.92 iommu.c
--- sys/arch/sparc/sparc/iommu.c	7 Nov 2009 07:27:46 -0000	1.92
+++ sys/arch/sparc/sparc/iommu.c	13 Apr 2011 20:01:16 -0000
@@ -277,7 +277,7 @@
 
 	sc->sc_dvmamap = extent_create("iommudvma",
 					IOMMU_DVMA_BASE, IOMMU_DVMA_END,
-					M_DEVBUF, 0, 0, EX_NOWAIT);
+					0, 0, EX_NOWAIT);
 	if (sc->sc_dvmamap == NULL)
 		panic("iommu: unable to allocate DVMA map");
 
Index: sys/arch/sparc/sparc/machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/sparc/machdep.c,v
retrieving revision 1.307
diff -u -r1.307 machdep.c
--- sys/arch/sparc/sparc/machdep.c	4 Mar 2011 22:25:28 -0000	1.307
+++ sys/arch/sparc/sparc/machdep.c	13 Apr 2011 20:01:17 -0000
@@ -320,7 +320,7 @@
 		 */
 		dvmamap24 = extent_create("dvmamap24",
 					  D24_DVMA_BASE, D24_DVMA_END,
-					  M_DEVBUF, 0, 0, EX_NOWAIT);
+					  0, 0, EX_NOWAIT);
 		if (dvmamap24 == NULL)
 			panic("unable to allocate DVMA map");
 	}
Index: sys/arch/sparc64/dev/iommu.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc64/dev/iommu.c,v
retrieving revision 1.103
diff -u -r1.103 iommu.c
--- sys/arch/sparc64/dev/iommu.c	20 Mar 2011 21:26:36 -0000	1.103
+++ sys/arch/sparc64/dev/iommu.c	13 Apr 2011 20:01:17 -0000
@@ -200,7 +200,7 @@
 		(unsigned long long)(is->is_ptsb + size - 1));
 	is->is_dvmamap = extent_create(name,
 	    is->is_dvmabase, is->is_dvmaend,
-	    M_DEVBUF, 0, 0, EX_NOWAIT);
+	    0, 0, EX_NOWAIT);
 	/* XXXMRG Check is_dvmamap is valid. */
 
 	/*
Index: sys/arch/sparc64/dev/psycho.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc64/dev/psycho.c,v
retrieving revision 1.105
diff -u -r1.105 psycho.c
--- sys/arch/sparc64/dev/psycho.c	4 Apr 2011 20:37:54 -0000	1.105
+++ sys/arch/sparc64/dev/psycho.c	13 Apr 2011 20:01:18 -0000
@@ -794,8 +794,7 @@
 	}
 
 	/* create extent */
-	ex = extent_create(name, baddr, bsize - baddr - 1, M_DEVBUF, 0, 0,
-			   EX_NOWAIT);
+	ex = extent_create(name, baddr, bsize - baddr - 1, 0, 0, EX_NOWAIT);
 	if (ex == NULL) {
 		printf("psycho_alloc_extent: extent_create failed\n");
 		goto ret;
Index: sys/arch/sparc64/sparc64/machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc64/sparc64/machdep.c,v
retrieving revision 1.256
diff -u -r1.256 machdep.c
--- sys/arch/sparc64/sparc64/machdep.c	4 Mar 2011 22:25:29 -0000	1.256
+++ sys/arch/sparc64/sparc64/machdep.c	13 Apr 2011 20:01:20 -0000
@@ -1643,7 +1643,7 @@
 		 */
 		io_space = extent_create("IOSPACE",
 					 (u_long)IODEV_BASE, (u_long)IODEV_END,
-					 M_DEVBUF, 0, 0, EX_NOWAIT);
+					 0, 0, EX_NOWAIT);
 
 
 	size = round_page(size);
Index: sys/arch/sun2/sun2/machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sun2/sun2/machdep.c,v
retrieving revision 1.68
diff -u -r1.68 machdep.c
--- sys/arch/sun2/sun2/machdep.c	4 Mar 2011 22:25:29 -0000	1.68
+++ sys/arch/sun2/sun2/machdep.c	13 Apr 2011 20:01:21 -0000
@@ -357,7 +357,7 @@
 	 */
 	dvmamap = extent_create("dvmamap",
 	    DVMA_MAP_BASE, DVMA_MAP_BASE + DVMA_MAP_AVAIL,
-	    M_DEVBUF, 0, 0, EX_NOWAIT);
+	    0, 0, EX_NOWAIT);
 	if (dvmamap == NULL)
 		panic("unable to allocate DVMA map");
 
Index: sys/arch/sun3/sun3/dvma.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sun3/sun3/dvma.c,v
retrieving revision 1.36
diff -u -r1.36 dvma.c
--- sys/arch/sun3/sun3/dvma.c	11 Dec 2009 13:52:57 -0000	1.36
+++ sys/arch/sun3/sun3/dvma.c	13 Apr 2011 20:01:21 -0000
@@ -43,7 +43,7 @@
 #include <sys/core.h>
 #include <sys/exec.h>
 
-#include <uvm/uvm.h> /* XXX: not _extern ... need uvm_map_create */
+#include <uvm/uvm.h> /* XXX: not _extern ... need uvm_map_setup */
 
 #define _SUN68K_BUS_DMA_PRIVATE
 #include <machine/autoconf.h>
@@ -82,11 +82,13 @@
 	 * dvma_extent manages things handled in interrupt
 	 * context.
 	 */
-	phys_map = uvm_map_create(pmap_kernel(),
-	    DVMA_MAP_BASE, DVMA_MAP_END, 0);
+	phys_map = kmem_alloc(sizeof(struct vm_map), KM_SLEEP);
 	if (phys_map == NULL)
 		panic("unable to create DVMA map");
 
+	uvm_map_setup(phys_map, DVMA_MAP_BASE, DVMA_MAP_END, 0);
+	phys_map->pmap = pmap_kernel();
+
 	/*
 	 * Reserve the DVMA space used for segment remapping.
 	 * The remainder of phys_map is used for DVMA scratch
@@ -102,7 +104,7 @@
 	 * into DVMA space for the purpose of data transfer.
 	 */
 	dvma_extent = extent_create("dvma", segmap_addr,
-	    segmap_addr + (dvma_segmap_size - 1), M_DEVBUF,
+	    segmap_addr + (dvma_segmap_size - 1),
 	    NULL, 0, EX_NOCOALESCE|EX_NOWAIT);
 }
 
Index: sys/arch/sun3/sun3x/dvma.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sun3/sun3x/dvma.c,v
retrieving revision 1.40
diff -u -r1.40 dvma.c
--- sys/arch/sun3/sun3x/dvma.c	21 Nov 2009 04:16:53 -0000	1.40
+++ sys/arch/sun3/sun3x/dvma.c	13 Apr 2011 20:01:21 -0000
@@ -114,7 +114,7 @@
 	 * Create the extent map for DVMA pages.
 	 */
 	dvma_extent = extent_create("dvma", DVMA_MAP_BASE,
-	    DVMA_MAP_BASE + (DVMA_MAP_AVAIL - 1), M_DEVBUF,
+	    DVMA_MAP_BASE + (DVMA_MAP_AVAIL - 1),
 	    NULL, 0, EX_NOCOALESCE|EX_NOWAIT);
 
 	/*
Index: sys/arch/vax/vax/machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/vax/vax/machdep.c,v
retrieving revision 1.180
diff -u -r1.180 machdep.c
--- sys/arch/vax/vax/machdep.c	14 Dec 2010 23:44:49 -0000	1.180
+++ sys/arch/vax/vax/machdep.c	13 Apr 2011 20:01:23 -0000
@@ -308,7 +308,7 @@
 	 */
 	KASSERT(iospace != 0);
 	iomap_ex = extent_create("iomap", iospace + VAX_NBPG,
-	    iospace + ((IOSPSZ * VAX_NBPG) - 1), M_DEVBUF,
+	    iospace + ((IOSPSZ * VAX_NBPG) - 1),
 	    (void *) iomap_ex_storage, sizeof(iomap_ex_storage),
 	    EX_NOCOALESCE|EX_NOWAIT);
 #ifdef DEBUG
Index: sys/arch/vax/vax/sgmap.c
===================================================================
RCS file: /cvsroot/src/sys/arch/vax/vax/sgmap.c,v
retrieving revision 1.16
diff -u -r1.16 sgmap.c
--- sys/arch/vax/vax/sgmap.c	14 Dec 2010 23:44:50 -0000	1.16
+++ sys/arch/vax/vax/sgmap.c	13 Apr 2011 20:01:23 -0000
@@ -93,7 +93,7 @@
 	 * space.
 	 */
 	sgmap->aps_ex = extent_create(name, sgvabase, sgvasize - 1,
-	    M_DMAMAP, NULL, 0, EX_NOWAIT|EX_NOCOALESCE);
+	    NULL, 0, EX_NOWAIT|EX_NOCOALESCE);
 	if (sgmap->aps_ex == NULL) {
 		printf("unable to create extent map for sgmap `%s'\n", name);
 		goto die;
Index: sys/arch/x68k/dev/intio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/x68k/dev/intio.c,v
retrieving revision 1.42
diff -u -r1.42 intio.c
--- sys/arch/x68k/dev/intio.c	18 Jan 2009 05:00:39 -0000	1.42
+++ sys/arch/x68k/dev/intio.c	13 Apr 2011 20:01:25 -0000
@@ -162,7 +162,7 @@
 	sc->sc_map = extent_create("intiomap",
 				  INTIOBASE,
 				  INTIOBASE + 0x400000,
-				  M_DEVBUF, NULL, 0, EX_NOWAIT);
+				  NULL, 0, EX_NOWAIT);
 	intio_alloc_system_ports(sc);
 
 	sc->sc_bst = &intio_bus;
Index: sys/arch/x86/pci/pci_addr_fixup.c
===================================================================
RCS file: /cvsroot/src/sys/arch/x86/pci/pci_addr_fixup.c,v
retrieving revision 1.5
diff -u -r1.5 pci_addr_fixup.c
--- sys/arch/x86/pci/pci_addr_fixup.c	26 Jul 2010 22:33:23 -0000	1.5
+++ sys/arch/x86/pci/pci_addr_fixup.c	13 Apr 2011 20:01:26 -0000
@@ -94,12 +94,12 @@
 	pciaddr.extent_mem = extent_create("PCI I/O memory space",
 					   PCIADDR_MEM_START, 
 					   PCIADDR_MEM_END,
-					   M_DEVBUF, 0, 0, EX_NOWAIT);
+					   0, 0, EX_NOWAIT);
 	KASSERT(pciaddr.extent_mem);
 	pciaddr.extent_port = extent_create("PCI I/O port space",
 					    PCIADDR_PORT_START,
 					    PCIADDR_PORT_END,
-					    M_DEVBUF, 0, 0, EX_NOWAIT);
+					    0, 0, EX_NOWAIT);
 	KASSERT(pciaddr.extent_port);
 
 	/* 
Index: sys/arch/x86/x86/bus_space.c
===================================================================
RCS file: /cvsroot/src/sys/arch/x86/x86/bus_space.c,v
retrieving revision 1.33
diff -u -r1.33 bus_space.c
--- sys/arch/x86/x86/bus_space.c	11 Feb 2011 23:08:38 -0000	1.33
+++ sys/arch/x86/x86/bus_space.c	13 Apr 2011 20:01:26 -0000
@@ -125,10 +125,10 @@
 	 * extents of RAM are allocated from the map (0 -> ISA hole
 	 * and end of ISA hole -> end of RAM).
 	 */
-	ioport_ex = extent_create("ioport", 0x0, 0xffff, M_DEVBUF,
+	ioport_ex = extent_create("ioport", 0x0, 0xffff,
 	    (void *)ioport_ex_storage, sizeof(ioport_ex_storage),
 	    EX_NOCOALESCE|EX_NOWAIT);
-	iomem_ex = extent_create("iomem", 0x0, 0xffffffff, M_DEVBUF,
+	iomem_ex = extent_create("iomem", 0x0, 0xffffffff,
 	    (void *)iomem_ex_storage, sizeof(iomem_ex_storage),
 	    EX_NOCOALESCE|EX_NOWAIT);
 
Index: sys/dev/cardbus/rbus.c
===================================================================
RCS file: /cvsroot/src/sys/dev/cardbus/rbus.c,v
retrieving revision 1.28
diff -u -r1.28 rbus.c
--- sys/dev/cardbus/rbus.c	15 Dec 2009 22:17:12 -0000	1.28
+++ sys/dev/cardbus/rbus.c	13 Apr 2011 20:01:31 -0000
@@ -258,7 +258,7 @@
 	if (flags == RBUS_SPACE_SHARE) {
 		ex = parent->rb_ext;
 	} else if (flags == RBUS_SPACE_DEDICATE) {
-		if (NULL == (ex = extent_create("rbus", start, end, M_DEVBUF,
+		if (NULL == (ex = extent_create("rbus", start, end,
 		    NULL, 0, EX_NOCOALESCE|EX_NOWAIT))) {
 			return NULL;
 		}
@@ -295,7 +295,7 @@
 	struct extent *ex;
 
 	if (NULL == (ex = extent_create("rbus root", start, start + size,
-	    M_DEVBUF, NULL, 0, EX_NOCOALESCE|EX_NOWAIT))) {
+	    NULL, 0, EX_NOCOALESCE|EX_NOWAIT))) {
 		return NULL;
 	}
 
Index: sys/dev/ic/cpc700.c
===================================================================
RCS file: /cvsroot/src/sys/dev/ic/cpc700.c,v
retrieving revision 1.17
diff -u -r1.17 cpc700.c
--- sys/dev/ic/cpc700.c	10 Dec 2010 00:38:49 -0000	1.17
+++ sys/dev/ic/cpc700.c	13 Apr 2011 20:01:35 -0000
@@ -191,9 +191,9 @@
 
 #if NPCI > 0 && defined(PCI_NETBSD_CONFIGURE)
 	ioext  = extent_create("pciio",  CPC_PCI_IO_START, CPC_PCI_IO_END,
-	    M_DEVBUF, NULL, 0, EX_NOWAIT);
+	    NULL, 0, EX_NOWAIT);
 	memext = extent_create("pcimem", CPC_PCI_MEM_BASE, CPC_PCI_MEM_END,
-	    M_DEVBUF, NULL, 0, EX_NOWAIT);
+	    NULL, 0, EX_NOWAIT);
 
 	pci_configure_bus(0, ioext, memext, NULL, 0, 32);
 
Index: sys/dev/marvell/gtpci.c
===================================================================
RCS file: /cvsroot/src/sys/dev/marvell/gtpci.c,v
retrieving revision 1.27
diff -u -r1.27 gtpci.c
--- sys/dev/marvell/gtpci.c	1 Aug 2010 06:57:06 -0000	1.27
+++ sys/dev/marvell/gtpci.c	13 Apr 2011 20:01:37 -0000
@@ -454,10 +454,8 @@
 	p2pc = GTPCI_READ(sc, GTPCI_P2PC);
 
 #ifdef PCI_NETBSD_CONFIGURE
-	ioext = extent_create("pciio", iostart, ioend, M_DEVBUF, NULL, 0,
-	    EX_NOWAIT);
-	memext = extent_create("pcimem", memstart, memend, M_DEVBUF, NULL, 0,
-	    EX_NOWAIT);
+	ioext = extent_create("pciio", iostart, ioend, NULL, 0, EX_NOWAIT);
+	memext = extent_create("pcimem", memstart, memend, NULL, 0, EX_NOWAIT);
 	if (ioext != NULL && memext != NULL)
 		pci_configure_bus(pc, ioext, memext, NULL,
 		    GTPCI_P2PC_BUSNUMBER(p2pc), cacheline_size);
Index: sys/dev/marvell/mvpex.c
===================================================================
RCS file: /cvsroot/src/sys/dev/marvell/mvpex.c,v
retrieving revision 1.4
diff -u -r1.4 mvpex.c
--- sys/dev/marvell/mvpex.c	4 Apr 2011 20:37:56 -0000	1.4
+++ sys/dev/marvell/mvpex.c	13 Apr 2011 20:01:37 -0000
@@ -417,10 +417,8 @@
 	stat = bus_space_read_4(sc->sc_iot, sc->sc_ioh, MVPEX_STAT);
 
 #ifdef PCI_NETBSD_CONFIGURE
-	ioext = extent_create("pexio", iostart, ioend, M_DEVBUF, NULL, 0,
-	    EX_NOWAIT);
-	memext = extent_create("pexmem", memstart, memend, M_DEVBUF, NULL, 0,
-	    EX_NOWAIT);
+	ioext = extent_create("pexio", iostart, ioend, NULL, 0, EX_NOWAIT);
+	memext = extent_create("pexmem", memstart, memend, NULL, 0, EX_NOWAIT);
 	if (ioext != NULL && memext != NULL)
 		pci_configure_bus(pc, ioext, memext, NULL,
 		    MVPEX_STAT_PEXBUSNUM(stat), cacheline_size);
Index: sys/dev/pci/btvmei.c
===================================================================
RCS file: /cvsroot/src/sys/dev/pci/btvmei.c,v
retrieving revision 1.26
diff -u -r1.26 btvmei.c
--- sys/dev/pci/btvmei.c	26 Nov 2009 15:17:08 -0000	1.26
+++ sys/dev/pci/btvmei.c	13 Apr 2011 20:01:38 -0000
@@ -303,16 +303,16 @@
 	 * set up scatter page allocation control
 	 */
 	sc->vmeext = extent_create("pcivme", MR_PCI_VME,
-				   MR_PCI_VME + MR_PCI_VME_SIZE - 1, M_DEVBUF,
+				   MR_PCI_VME + MR_PCI_VME_SIZE - 1,
 				   sc->vmemap, sizeof(sc->vmemap),
 				   EX_NOCOALESCE);
 #if 0
 	sc->pciext = extent_create("vmepci", MR_VME_PCI,
-				   MR_VME_PCI + MR_VME_PCI_SIZE - 1, M_DEVBUF,
+				   MR_VME_PCI + MR_VME_PCI_SIZE - 1,
 				   sc->pcimap, sizeof(sc->pcimap),
 				   EX_NOCOALESCE);
 	sc->dmaext = extent_create("dmapci", MR_DMA_PCI,
-				   MR_DMA_PCI + MR_DMA_PCI_SIZE - 1, M_DEVBUF,
+				   MR_DMA_PCI + MR_DMA_PCI_SIZE - 1,
 				   sc->dmamap, sizeof(sc->dmamap),
 				   EX_NOCOALESCE);
 #endif
Index: sys/dev/pci/pciconf.c
===================================================================
RCS file: /cvsroot/src/sys/dev/pci/pciconf.c,v
retrieving revision 1.32
diff -u -r1.32 pciconf.c
--- sys/dev/pci/pciconf.c	11 Dec 2010 18:21:14 -0000	1.32
+++ sys/dev/pci/pciconf.c	13 Apr 2011 20:01:39 -0000
@@ -713,7 +713,7 @@
 		}
 		if (pd->ppb && pi->reg == 0) {
 			pd->ppb->ioext = extent_create("pciconf", pi->address,
-			    pi->address + pi->size, M_DEVBUF, NULL, 0,
+			    pi->address + pi->size, NULL, 0,
 			    EX_NOWAIT);
 			if (pd->ppb->ioext == NULL) {
 				print_tag(pd->pc, pd->tag);
@@ -764,8 +764,7 @@
 		}
 		if (pd->ppb && pm->reg == 0) {
 			ex = extent_create("pciconf", pm->address,
-			    pm->address + pm->size, M_DEVBUF, NULL, 0,
-			    EX_NOWAIT);
+			    pm->address + pm->size, NULL, 0, EX_NOWAIT);
 			if (ex == NULL) {
 				print_tag(pd->pc, pd->tag);
 				printf("Failed to alloc MEM ext. for bus %d\n",
Index: sys/dev/usb/usb_mem.c
===================================================================
RCS file: /cvsroot/src/sys/dev/usb/usb_mem.c,v
retrieving revision 1.46
diff -u -r1.46 usb_mem.c
--- sys/dev/usb/usb_mem.c	20 Mar 2011 17:38:11 -0000	1.46
+++ sys/dev/usb/usb_mem.c	13 Apr 2011 20:01:39 -0000
@@ -395,8 +395,7 @@
 
 	rs->paddr = rs->map->dm_segs[0].ds_addr;
 	rs->extent = extent_create(device_xname(dv), (u_long)rs->paddr,
-	    (u_long)(rs->paddr + USB_MEM_RESERVE - 1),
-	    M_USB, 0, 0, 0);
+	    (u_long)(rs->paddr + USB_MEM_RESERVE - 1), 0, 0, 0);
 	if (rs->extent == NULL) {
 		rs->vaddr = 0;
 		return ENOMEM;
Index: sys/dev/vme/vme.c
===================================================================
RCS file: /cvsroot/src/sys/dev/vme/vme.c,v
retrieving revision 1.24
diff -u -r1.24 vme.c
--- sys/dev/vme/vme.c	11 Dec 2010 18:12:45 -0000	1.24
+++ sys/dev/vme/vme.c	13 Apr 2011 20:01:40 -0000
@@ -187,22 +187,19 @@
 	/*
 	 * set up address space accounting - assume incomplete decoding
 	 */
-	sc->vme32ext = extent_create("vme32", 0, 0xffffffff,
-				     M_DEVBUF, 0, 0, 0);
+	sc->vme32ext = extent_create("vme32", 0, 0xffffffff, 0, 0, 0);
 	if (!sc->vme32ext) {
 		printf("error creating A32 map\n");
 		return;
 	}
 
-	sc->vme24ext = extent_create("vme24", 0, 0x00ffffff,
-				     M_DEVBUF, 0, 0, 0);
+	sc->vme24ext = extent_create("vme24", 0, 0x00ffffff, 0, 0, 0);
 	if (!sc->vme24ext) {
 		printf("error creating A24 map\n");
 		return;
 	}
 
-	sc->vme16ext = extent_create("vme16", 0, 0x0000ffff,
-				     M_DEVBUF, 0, 0, 0);
+	sc->vme16ext = extent_create("vme16", 0, 0x0000ffff, 0, 0, 0);
 	if (!sc->vme16ext) {
 		printf("error creating A16 map\n");
 		return;
Index: sys/kern/subr_extent.c
===================================================================
RCS file: /cvsroot/src/sys/kern/subr_extent.c,v
retrieving revision 1.72
diff -u -r1.72 subr_extent.c
--- sys/kern/subr_extent.c	28 Apr 2008 20:24:04 -0000	1.72
+++ sys/kern/subr_extent.c	13 Apr 2011 20:01:41 -0000
@@ -41,7 +41,7 @@
 
 #include <sys/param.h>
 #include <sys/extent.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
 #include <sys/pool.h>
 #include <sys/time.h>
 #include <sys/systm.h>
@@ -69,15 +69,15 @@
  * in subr_extent.c rather than subr_prf.c.
  */
 #define	\
-malloc(s, t, flags)		malloc(s)
+kmem_alloc(s, flags)		malloc(s)
 #define	\
-free(p, t)			free(p)
+kmem_free(p, s)			free(p)
 #define	\
 cv_wait_sig(cv, lock)		(EWOULDBLOCK)
 #define	\
-pool_get(pool, flags)		malloc((pool)->pr_size,0,0)
+pool_get(pool, flags)		kmem_alloc((pool)->pr_size,0)
 #define	\
-pool_put(pool, rp)		free(rp,0)
+pool_put(pool, rp)		kmem_free(rp,0)
 #define	\
 panic(a)			printf(a)
 #define	mutex_init(a, b, c)
@@ -235,7 +235,7 @@
  */
 struct extent *
 extent_create(const char *name, u_long start, u_long end,
-    struct malloc_type *mtype, void *storage, size_t storagesize, int flags)
+    void *storage, size_t storagesize, int flags)
 {
 	struct extent *ex;
 	char *cp = storage;
@@ -291,8 +291,8 @@
 			LIST_INSERT_HEAD(&fex->fex_freelist, rp, er_link);
 		}
 	} else {
-		ex = (struct extent *)malloc(sizeof(struct extent),
-		    mtype, (flags & EX_WAITOK) ? M_WAITOK : M_NOWAIT);
+		ex = (struct extent *)kmem_alloc(sizeof(struct extent),
+		    (flags & EX_WAITOK) ? KM_SLEEP : KM_NOSLEEP);
 		if (ex == NULL)
 			return (NULL);
 	}
@@ -304,7 +304,6 @@
 	ex->ex_name = name;
 	ex->ex_start = start;
 	ex->ex_end = end;
-	ex->ex_mtype = mtype;
 	ex->ex_flags = 0;
 	if (fixed_extent)
 		ex->ex_flags |= EXF_FIXED;
@@ -342,7 +341,7 @@
 
 	/* If we're not a fixed extent, free the extent descriptor itself. */
 	if ((ex->ex_flags & EXF_FIXED) == 0)
-		free(ex, ex->ex_mtype);
+		kmem_free(ex, sizeof(*ex));
 }
 
 /*
Index: sys/sys/extent.h
===================================================================
RCS file: /cvsroot/src/sys/sys/extent.h,v
retrieving revision 1.18
diff -u -r1.18 extent.h
--- sys/sys/extent.h	28 Apr 2008 20:24:10 -0000	1.18
+++ sys/sys/extent.h	13 Apr 2011 20:01:42 -0000
@@ -54,7 +54,6 @@
 	LIST_HEAD(, extent_region) ex_regions;
 	u_long	ex_start;		/* start of extent */
 	u_long	ex_end;			/* end of extent */
-	struct malloc_type *ex_mtype;	/* memory type */
 	int	ex_flags;		/* misc. information */
 };
 
@@ -79,7 +78,7 @@
 #define EX_FAST		0x02		/* take first fit in extent_alloc() */
 #define EX_CATCH	0x04		/* catch signals while sleeping */
 #define EX_NOCOALESCE	0x08		/* create a non-coalescing extent */
-#define EX_MALLOCOK	0x10		/* safe to call malloc() */
+#define EX_MALLOCOK	0x10		/* safe to call kmem_alloc() */
 #define EX_WAITSPACE	0x20		/* wait for space to become free */
 #define EX_BOUNDZERO	0x40		/* boundary lines start at 0 */
 
@@ -96,10 +95,8 @@
 	((ALIGN(sizeof(struct extent_region))) *	\
 	 (_nregions)))
 
-struct malloc_type;
-
 struct	extent *extent_create(const char *, u_long, u_long,
-	    struct malloc_type *, void *, size_t, int);
+	    void *, size_t, int);
 void	extent_destroy(struct extent *);
 int	extent_alloc_subregion1(struct extent *, u_long, u_long,
 	    u_long, u_long, u_long, u_long, int, u_long *);
Index: tests/kernel/t_extent.c
===================================================================
RCS file: /cvsroot/src/tests/kernel/t_extent.c,v
retrieving revision 1.2
diff -u -r1.2 t_extent.c
--- tests/kernel/t_extent.c	3 Nov 2010 16:10:20 -0000	1.2
+++ tests/kernel/t_extent.c	13 Apr 2011 20:01:45 -0000
@@ -48,7 +48,7 @@
 
 #define h_create(name, start, end, flags) \
 	ATF_REQUIRE((ex = extent_create(name, \
-	    start, end, 0, 0, 0, flags)) != NULL);
+	    start, end, 0, 0, flags)) != NULL);
 
 #define h_alloc_region(start, size) \
 	ATF_REQUIRE_EQ_MSG(ret = extent_alloc_region(ex, \