 @@ -1,14 +1,14 @@
-/*	$NetBSD: mainbus.c,v 1.25 2011/07/09 16:03:01 matt Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.26 2012/01/27 18:52:47 para Exp $	*/
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.25 2011/07/09 16:03:01 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.26 2012/01/27 18:52:47 para Exp $");
 #include "opt_algor_p4032.h"
 #include "opt_algor_p5064.h"
 #include "opt_algor_p6032.h"
 #include "opt_pci.h"
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/extent.h>
 #include <sys/malloc.h>
 @@ -149,54 +149,54 @@ mainbus_attach(device_t parent, device_t
 #endif
 #endif
 	mainbus_found = 1;
 	printf("\n");
 #if NPCI > 0 && defined(PCI_NETBSD_CONFIGURE)
 #if defined(ALGOR_P4032)
 	/*
 	 * 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)
 	/*
 	 * Reserve the bottom 512K of the I/O space for ISA devices.
 	 * According to the PMON sources, this is a work-around for
 	 * 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)
 	idetag = pci_make_tag(pc, 0, 2, 1);
 #endif
 #elif defined(ALGOR_P6032)
 	/*
 	 * 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)
 	idetag = pci_make_tag(pc, 0, 17, 1);
 #endif
 #endif /* ALGOR_P4032 || ALGOR_P5064 || ALGOR_P6032 */
 	pci_configure_bus(pc, ioext, memext, NULL, 0, mips_cache_info.mci_dcache_align);
 	extent_destroy(ioext);
 	extent_destroy(memext);
 #if defined(PCI_NETBSD_ENABLE_IDE)
 	/*

 @@ -1,14 +1,14 @@
-/* $NetBSD: sgmap_common.c,v 1.25 2011/07/01 19:22:35 dyoung Exp $ */
+/* $NetBSD: sgmap_common.c,v 1.26 2012/01/27 18:52:48 para Exp $ */
 /*-
  * Copyright (c) 1997, 1998, 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -22,27 +22,27 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: sgmap_common.c,v 1.25 2011/07/01 19:22:35 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sgmap_common.c,v 1.26 2012/01/27 18:52:48 para Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #include <uvm/uvm_extern.h>
 #define	_ALPHA_BUS_DMA_PRIVATE
 #include <sys/bus.h>
 #include <alpha/common/sgmapvar.h>
 @@ -97,27 +97,27 @@ alpha_sgmap_init(bus_dma_tag_t t, struct
 			panic("unable to allocate page table for sgmap `%s'",
 			    name);
 			goto die;
+		}
 		sgmap->aps_ptpa = seg.ds_addr;
 		sgmap->aps_pt = (void *)ALPHA_PHYS_TO_K0SEG(sgmap->aps_ptpa);
+	}
 	/*
 	 * Create the extent map used to manage the virtual address
 	 * 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;
+	}
 	/*
 	 * Allocate a spill page if that hasn't already been done.
 	 */
 	if (alpha_sgmap_prefetch_spill_page_va == 0) {
 		if (bus_dmamem_alloc(t, PAGE_SIZE, 0, 0, &seg, 1, &rseg,
 		    BUS_DMA_NOWAIT)) {
 			printf("unable to allocate spill page for sgmap `%s'\n",

 @@ -1,14 +1,14 @@
-/* $NetBSD: pci_bwx_bus_io_chipdep.c,v 1.19 2011/09/25 13:36:53 chs Exp $ */
+/* $NetBSD: pci_bwx_bus_io_chipdep.c,v 1.20 2012/01/27 18:52:49 para Exp $ */
 /*-
  * Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -66,27 +66,27 @@
  *	CHIP_IO_BASE	I/O space base to use.
  *	CHIP_IO_EX_STORE
  *			If defined, device-provided static storage area
  *			for the I/O space extent.  If this is defined,
  *			CHIP_IO_EX_STORE_SIZE must also be defined.  If
  *			this is not defined, a static area will be
  *			declared.
  *	CHIP_IO_EX_STORE_SIZE
  *			Size of the device-provided static storage area
  *			for the I/O memory space extent.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: pci_bwx_bus_io_chipdep.c,v 1.19 2011/09/25 13:36:53 chs Exp $");
+__KERNEL_RCSID(1, "$NetBSD: pci_bwx_bus_io_chipdep.c,v 1.20 2012/01/27 18:52:49 para Exp $");
 #include <sys/extent.h>
 #include <machine/bwx.h>
 #define	__C(A,B)	__CONCAT(A,B)
 #define	__S(S)		__STRING(S)
 /* mapping/unmapping */
 int		__C(CHIP,_io_map)(void *, bus_addr_t, bus_size_t, int,
 		    bus_space_handle_t *, int);
 void		__C(CHIP,_io_unmap)(void *, bus_space_handle_t,
 		    bus_size_t, int);
 @@ -292,27 +292,27 @@ __C(CHIP,_bus_io_init)(t, v)
 	/* set region */
 	t->abs_sr_1 =		__C(CHIP,_io_set_region_1);
 	t->abs_sr_2 =		__C(CHIP,_io_set_region_2);
 	t->abs_sr_4 =		__C(CHIP,_io_set_region_4);
 	t->abs_sr_8 =		__C(CHIP,_io_set_region_8);
 	/* copy */
 	t->abs_c_1 =		__C(CHIP,_io_copy_region_1);
 	t->abs_c_2 =		__C(CHIP,_io_copy_region_2);
 	t->abs_c_4 =		__C(CHIP,_io_copy_region_4);
 	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;
+}
 int
 __C(CHIP,_io_translate)(v, ioaddr, iolen, flags, abst)
 	void *v;
 	bus_addr_t ioaddr;
 	bus_size_t iolen;
 	int flags;
 	struct alpha_bus_space_translation *abst;
+{

 @@ -1,14 +1,14 @@
-/* $NetBSD: pci_bwx_bus_mem_chipdep.c,v 1.23 2011/09/25 13:36:53 chs Exp $ */
+/* $NetBSD: pci_bwx_bus_mem_chipdep.c,v 1.24 2012/01/27 18:52:49 para Exp $ */
 /*-
  * Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -66,27 +66,27 @@
  *	CHIP_MEM_BASE	Mem space base to use.
  *	CHIP_MEM_EX_STORE
  *			If defined, device-provided static storage area
  *			for the memory space extent.  If this is
  *			defined, CHIP_MEM_EX_STORE_SIZE must also be
  *			defined.  If this is not defined, a static area
  *			will be declared.
  *	CHIP_MEM_EX_STORE_SIZE
  *			Size of the device-provided static storage area
  *			for the memory space extent.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: pci_bwx_bus_mem_chipdep.c,v 1.23 2011/09/25 13:36:53 chs Exp $");
+__KERNEL_RCSID(1, "$NetBSD: pci_bwx_bus_mem_chipdep.c,v 1.24 2012/01/27 18:52:49 para Exp $");
 #include <sys/extent.h>
 #include <machine/bwx.h>
 #define	__C(A,B)	__CONCAT(A,B)
 #define	__S(S)		__STRING(S)
 /* mapping/unmapping */
 int		__C(CHIP,_mem_map)(void *, bus_addr_t, bus_size_t, int,
 		    bus_space_handle_t *, int);
 void		__C(CHIP,_mem_unmap)(void *, bus_space_handle_t,
 		    bus_size_t, int);
 @@ -292,27 +292,27 @@ __C(CHIP,_bus_mem_init)(t, v)
 	/* set region */
 	t->abs_sr_1 =		__C(CHIP,_mem_set_region_1);
 	t->abs_sr_2 =		__C(CHIP,_mem_set_region_2);
 	t->abs_sr_4 =		__C(CHIP,_mem_set_region_4);
 	t->abs_sr_8 =		__C(CHIP,_mem_set_region_8);
 	/* copy */
 	t->abs_c_1 =		__C(CHIP,_mem_copy_region_1);
 	t->abs_c_2 =		__C(CHIP,_mem_copy_region_2);
 	t->abs_c_4 =		__C(CHIP,_mem_copy_region_4);
 	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;
+}
 int
 __C(CHIP,_mem_translate)(v, memaddr, memlen, flags, abst)
 	void *v;
 	bus_addr_t memaddr;
 	bus_size_t memlen;
 	int flags;
 	struct alpha_bus_space_translation *abst;
+{

 @@ -1,14 +1,14 @@
-/* $NetBSD: pci_swiz_bus_io_chipdep.c,v 1.39 2011/09/25 13:36:53 chs Exp $ */
+/* $NetBSD: pci_swiz_bus_io_chipdep.c,v 1.40 2012/01/27 18:52:49 para Exp $ */
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -66,27 +66,27 @@
  *	CHIP_IO_BASE	Sparse I/O space base to use.
  *	CHIP_IO_EX_STORE
  *			If defined, device-provided static storage area
  *			for the I/O space extent.  If this is defined,
  *			CHIP_IO_EX_STORE_SIZE must also be defined.  If
  *			this is not defined, a static area will be
  *			declared.
  *	CHIP_IO_EX_STORE_SIZE
  *			Size of the device-provided static storage area
  *			for the I/O memory space extent.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: pci_swiz_bus_io_chipdep.c,v 1.39 2011/09/25 13:36:53 chs Exp $");
+__KERNEL_RCSID(1, "$NetBSD: pci_swiz_bus_io_chipdep.c,v 1.40 2012/01/27 18:52:49 para Exp $");
 #include <sys/extent.h>
 #define	__C(A,B)	__CONCAT(A,B)
 #define	__S(S)		__STRING(S)
 /* mapping/unmapping */
 int		__C(CHIP,_io_map)(void *, bus_addr_t, bus_size_t, int,
 		    bus_space_handle_t *, int);
 void		__C(CHIP,_io_unmap)(void *, bus_space_handle_t,
 		    bus_size_t, int);
 int		__C(CHIP,_io_subregion)(void *, bus_space_handle_t,
 		    bus_size_t, bus_size_t, bus_space_handle_t *);
 @@ -297,27 +297,27 @@ __C(CHIP,_bus_io_init)(bus_space_tag_t t
 	t->abs_sr_1 =		__C(CHIP,_io_set_region_1);
 	t->abs_sr_2 =		__C(CHIP,_io_set_region_2);
 	t->abs_sr_4 =		__C(CHIP,_io_set_region_4);
 	t->abs_sr_8 =		__C(CHIP,_io_set_region_8);
 	/* copy */
 	t->abs_c_1 =		__C(CHIP,_io_copy_region_1);
 	t->abs_c_2 =		__C(CHIP,_io_copy_region_2);
 	t->abs_c_4 =		__C(CHIP,_io_copy_region_4);
 	t->abs_c_8 =		__C(CHIP,_io_copy_region_8);
 	/* 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);
 #ifdef CHIP_IO_W1_BUS_START
 #ifdef EXTENT_DEBUG
 	printf("io: freeing from 0x%lx to 0x%lx\n", CHIP_IO_W1_BUS_START(v),
 	    CHIP_IO_W1_BUS_END(v));
 #endif
 	extent_free(ex, CHIP_IO_W1_BUS_START(v),
 	    CHIP_IO_W1_BUS_END(v) - CHIP_IO_W1_BUS_START(v) + 1, EX_NOWAIT);
 #endif
 #ifdef CHIP_IO_W2_BUS_START
 #ifdef EXTENT_DEBUG

 @@ -1,14 +1,14 @@
-/* $NetBSD: pci_swiz_bus_mem_chipdep.c,v 1.44 2011/09/25 13:36:53 chs Exp $ */
+/* $NetBSD: pci_swiz_bus_mem_chipdep.c,v 1.45 2012/01/27 18:52:49 para Exp $ */
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -75,27 +75,27 @@
  *	CHIP_S_MEM_BASE	Sparse Mem space base to use.
  *	CHIP_S_MEM_EX_STORE
  *			If defined, device-provided static storage area
  *			for the sparse memory space extent.  If this is
  *			defined, CHIP_S_MEM_EX_STORE_SIZE must also be
  *			defined.  If this is not defined, a static area
  *			will be declared.
  *	CHIP_S_MEM_EX_STORE_SIZE
  *			Size of the device-provided static storage area
  *			for the sparse memory space extent.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: pci_swiz_bus_mem_chipdep.c,v 1.44 2011/09/25 13:36:53 chs Exp $");
+__KERNEL_RCSID(1, "$NetBSD: pci_swiz_bus_mem_chipdep.c,v 1.45 2012/01/27 18:52:49 para Exp $");
 #include <sys/extent.h>
 #define	__C(A,B)	__CONCAT(A,B)
 #define	__S(S)		__STRING(S)
 /* mapping/unmapping */
 int		__C(CHIP,_mem_map)(void *, bus_addr_t, bus_size_t, int,
 		    bus_space_handle_t *, int);
 void		__C(CHIP,_mem_unmap)(void *, bus_space_handle_t,
 		    bus_size_t, int);
 int		__C(CHIP,_mem_subregion)(void *, bus_space_handle_t,
 		    bus_size_t, bus_size_t, bus_space_handle_t *);
 @@ -319,50 +319,50 @@ __C(CHIP,_bus_mem_init)(bus_space_tag_t
 	t->abs_sr_2 =		__C(CHIP,_mem_set_region_2);
 	t->abs_sr_4 =		__C(CHIP,_mem_set_region_4);
 	t->abs_sr_8 =		__C(CHIP,_mem_set_region_8);
 	/* copy */
 	t->abs_c_1 =		__C(CHIP,_mem_copy_region_1);
 	t->abs_c_2 =		__C(CHIP,_mem_copy_region_2);
 	t->abs_c_4 =		__C(CHIP,_mem_copy_region_4);
 	t->abs_c_8 =		__C(CHIP,_mem_copy_region_8);
 #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,
-xffffffffffffffffUL, M_DEVBUF,
+xffffffffffffffffUL,
 	    (void *)CHIP_D_MEM_EX_STORE(v), CHIP_D_MEM_EX_STORE_SIZE(v),
 	    EX_NOWAIT);
 	extent_alloc_region(dex, 0, 0xffffffffffffffffUL, EX_NOWAIT);
 #ifdef CHIP_D_MEM_W1_BUS_START
 #ifdef EXTENT_DEBUG
 	printf("dmem: freeing from 0x%lx to 0x%lx\n",
 	    CHIP_D_MEM_W1_BUS_START(v), CHIP_D_MEM_W1_BUS_END(v));
 #endif
 	extent_free(dex, CHIP_D_MEM_W1_BUS_START(v),
 	    CHIP_D_MEM_W1_BUS_END(v) - CHIP_D_MEM_W1_BUS_START(v) + 1,
 	    EX_NOWAIT);
 #endif
 #ifdef EXTENT_DEBUG
         extent_print(dex);
 #endif
         CHIP_D_MEM_EXTENT(v) = dex;
 #endif /* CHIP_D_MEM_W1_SYS_START */
 	/* XXX WE WANT EXTENT_NOCOALESCE, BUT WE CAN'T USE IT. XXX */
 	sex = extent_create(__S(__C(CHIP,_bus_smem)), 0x0UL,
-xffffffffffffffffUL, M_DEVBUF,
+xffffffffffffffffUL,
 	    (void *)CHIP_S_MEM_EX_STORE(v), CHIP_S_MEM_EX_STORE_SIZE(v),
 	    EX_NOWAIT);
 	extent_alloc_region(sex, 0, 0xffffffffffffffffUL, EX_NOWAIT);
 #ifdef CHIP_S_MEM_W1_BUS_START
 #ifdef EXTENT_DEBUG
 	printf("smem: freeing from 0x%lx to 0x%lx\n",
 	    CHIP_S_MEM_W1_BUS_START(v), CHIP_S_MEM_W1_BUS_END(v));
 #endif
 	extent_free(sex, CHIP_S_MEM_W1_BUS_START(v),
 	    CHIP_S_MEM_W1_BUS_END(v) - CHIP_S_MEM_W1_BUS_START(v) + 1,
 	    EX_NOWAIT);
 #endif

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bus_space.c,v 1.11 2011/07/17 01:36:50 dyoung Exp $	*/
+/*	$NetBSD: bus_space.c,v 1.12 2012/01/27 18:52:49 para Exp $	*/
 /*	NetBSD: bus_machdep.c,v 1.1 2000/01/26 18:48:00 drochner Exp 	*/
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum and by Jason R. Thorpe of the Numerical Aerospace
  * Simulation Facility, NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -22,27 +22,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.11 2011/07/17 01:36:50 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.12 2012/01/27 18:52:49 para Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/extent.h>
 #include <uvm/uvm_extern.h>
 #include <sys/bus.h>
 /*
  *	uintN_t bus_space_read_N(bus_space_tag_t tag,
  *	    bus_space_handle_t bsh, bus_size_t offset);
 @@ -333,27 +333,27 @@ arc_bus_space_init(bus_space_tag_t bst,
 	bst->bs_aux = NULL;
 	bst->bs_stride_1 = 0;
 	bst->bs_stride_2 = 0;
 	bst->bs_stride_4 = 0;
 	bst->bs_stride_8 = 0;
+}
 void
 arc_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("arc_bus_space_init_extent: cannot create extent map %s",
 		    bst->bs_name);
+}
 void
 arc_bus_space_set_aligned_stride(bus_space_tag_t bst,
     unsigned int alignment_shift)
+{
 	bst->bs_stride_1 = alignment_shift;
 	if (alignment_shift > 0)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: wired_map_machdep.c,v 1.6 2009/12/16 23:19:06 matt Exp $	*/
+/*	$NetBSD: wired_map_machdep.c,v 1.7 2012/01/27 18:52:50 para Exp $	*/
 /*-
  * Copyright (C) 2000 Shuichiro URATA.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
 @@ -17,27 +17,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wired_map_machdep.c,v 1.6 2009/12/16 23:19:06 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wired_map_machdep.c,v 1.7 2012/01/27 18:52:50 para Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/extent.h>
 #include <uvm/uvm_extern.h>
 #include <machine/cpu.h>
 #include <machine/wired_map.h>
 #include <machine/vmparam.h>
 #include <mips/locore.h>
 #include <mips/pte.h>
 @@ -45,27 +45,27 @@ static bool arc_wired_map_paddr_entry(pa
     vsize_t *sizep);
 static bool arc_wired_map_vaddr_entry(vaddr_t va, paddr_t *pap,
     vsize_t *sizep);
 static struct extent *arc_wired_map_ex;
 static long wired_map_ex_storage[EXTENT_FIXED_STORAGE_SIZE(8) / sizeof(long)];
 void
 arc_init_wired_map(void)
+{
 	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)
 		panic("arc_init_wired_map: can't create extent");
+}
 void
 arc_wired_enter_page(vaddr_t va, paddr_t pa, vaddr_t pg_size)
+{
 	int error;
 	KASSERT((va & (pg_size - 1)) == 0);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: jazzdmatlb.c,v 1.15 2011/07/01 19:25:41 dyoung Exp $	*/
+/*	$NetBSD: jazzdmatlb.c,v 1.16 2012/01/27 18:52:50 para Exp $	*/
 /*	$OpenBSD: dma.c,v 1.5 1998/03/01 16:49:57 niklas Exp $	*/
 /*-
  * Copyright (C) 2000 Shuichiro URATA.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -23,27 +23,27 @@
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Jazz derived system dma driver. Handles resource allocation and
  * logical (virtual) address remaping.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: jazzdmatlb.c,v 1.15 2011/07/01 19:25:41 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: jazzdmatlb.c,v 1.16 2012/01/27 18:52:50 para Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/extent.h>
 #include <sys/device.h>
 #include <sys/proc.h>
 #include <uvm/uvm_extern.h>
 #include <machine/autoconf.h>
 #include <sys/bus.h>
 @@ -75,28 +75,27 @@ jazz_dmatlb_init(bus_space_tag_t iot, bu
+{
 	int err;
 	dmatlb_iot = iot;
 	err = bus_space_map(iot, ioaddr, JAZZ_DMATLB_REGSIZE, 0, &dmatlb_ioh);
 	if (err != 0)
 		panic("jazz_dmatlb_init: cannot map 0x%lx", ioaddr);
 	dma_tlb = (jazz_dma_pte_t *)PICA_TL_BASE;
 	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,
+	dmatlbmap = extent_create("dmatlb", 0, NDMATLB, NULL, 0, EX_NOWAIT);
 	    EX_NOWAIT);
 	if (dmatlbmap == NULL)
 		panic("jazz_dmatlb_init: cannot create extent map");
 	bus_space_write_4(dmatlb_iot, dmatlb_ioh, JAZZ_DMATLBREG_MAP,
 	    MIPS_KSEG1_TO_PHYS(dma_tlb));
 	bus_space_write_4(dmatlb_iot, dmatlb_ioh, JAZZ_DMATLBREG_LIMIT,
 	    JAZZ_DMATLB_SIZE);
 	jazz_dmatlb_flush();
+}
 /*
  *  Allocate an array of 'size' DMA PTEs.
  *  Return address to first pte.

 @@ -1,14 +1,14 @@
-/*	$NetBSD: necpb.c,v 1.37 2011/07/01 19:28:00 dyoung Exp $	*/
+/*	$NetBSD: necpb.c,v 1.38 2012/01/27 18:52:50 para Exp $	*/
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -51,27 +51,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: necpb.c,v 1.37 2011/07/01 19:28:00 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: necpb.c,v 1.38 2012/01/27 18:52:50 para Exp $");
 #include "opt_pci.h"
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/extent.h>
 #include <uvm/uvm_extern.h>
 @@ -233,29 +233,29 @@ necpbattach(device_t parent, device_t se
 	sc->sc_dev = self;
 	necpbfound = 1;
 	aprint_normal("\n");
 	sc->sc_ncp = &necpb_main_context;
 	necpb_init(sc->sc_ncp);
 	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
 	out32(RD94_SYS_PCI_INTMASK, 0xf);
 	for (i = 0; i < 4; i++)
 		necpb_inttbl[i] = NULL;
 	(*platform->set_intr)(MIPS_INT_MASK_2, necpb_intr, ARC_INTPRI_PCIISA);
 	pba.pba_iot = &sc->sc_ncp->nc_iot;
 	pba.pba_memt = &sc->sc_ncp->nc_memt;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: gemini_pci.c,v 1.10 2011/07/01 19:32:28 dyoung Exp $	*/
+/*	$NetBSD: gemini_pci.c,v 1.11 2012/01/27 18:52:50 para Exp $	*/
 /* adapted from:
  *	NetBSD: i80312_pci.c,v 1.9 2005/12/11 12:16:51 christos Exp
  */
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
 @@ -34,27 +34,27 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * PCI configuration support for i80312 Companion I/O chip.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gemini_pci.c,v 1.10 2011/07/01 19:32:28 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_pci.c,v 1.11 2012/01/27 18:52:50 para Exp $");
 #include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/extent.h>
 #include <sys/malloc.h>
 #include <uvm/uvm_extern.h>
 #include <sys/bus.h>
 #include <machine/intr.h>
 @@ -201,35 +201,35 @@ gemini_pci_init(pci_chipset_tag_t pc, vo
 	 * need to only configure devices in the private device space on
 	 * the Secondary bus.
 	 */
 	aprint_normal("%s: configuring Secondary PCI bus\n",
 		device_xname(sc->sc_dev));
 	/*
 	 * XXX PCI IO addr should be inherited ?
 	 */
 	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 ?
 	 */
 	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);
 	gemini_pci_conf_write(sc, 0, GEMINI_PCI_CFG_REG_MEM1,
 		PCI_CFG_REG_MEM_BASE((GEMINI_DRAM_BASE + (GEMINI_BUSBASE * 1024 * 1024)))
 		| gemini_pci_cfg_reg_mem_size(MEMSIZE * 1024 * 1024));
 	extent_destroy(ioext);
 	extent_destroy(memext);
 #endif
+}
 void

 @@ -1,14 +1,14 @@
-/* $NetBSD: ixp12x0_pci.c,v 1.10 2009/03/14 21:04:05 dsl Exp $ */
+/* $NetBSD: ixp12x0_pci.c,v 1.11 2012/01/27 18:52:51 para Exp $ */
 /*
  * Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Ichiro FUKUHARA and Naoto Shimazaki.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -19,27 +19,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixp12x0_pci.c,v 1.10 2009/03/14 21:04:05 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp12x0_pci.c,v 1.11 2012/01/27 18:52:51 para Exp $");
 /*
  * PCI configuration support for IXP12x0 Network Processor chip.
  */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/extent.h>
 #include <sys/malloc.h>
 #include <uvm/uvm_extern.h>
 @@ -85,32 +85,32 @@ ixp12x0_pci_init(pci_chipset_tag_t pc, v
 	struct ixp12x0_softc *sc = cookie;
 	struct extent *ioext, *memext;
 #endif
 	pc->pc_conf_v = cookie;
 	pc->pc_attach_hook = ixp12x0_pci_attach_hook;
 	pc->pc_bus_maxdevs = ixp12x0_pci_bus_maxdevs;
 	pc->pc_make_tag = ixp12x0_pci_make_tag;
 	pc->pc_decompose_tag = ixp12x0_pci_decompose_tag;
 	pc->pc_conf_read = ixp12x0_pci_conf_read;
 	pc->pc_conf_write = ixp12x0_pci_conf_write;
 #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);
 	extent_destroy(ioext);
 	extent_destroy(memext);
 #endif
+}
 void
 pci_conf_interrupt(pci_chipset_tag_t pc, int a, int b, int c, int d, int *p)
+{
 	/* Nothing */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: s3c2800_pci.c,v 1.16 2011/07/01 20:31:39 dyoung Exp $	*/
+/*	$NetBSD: s3c2800_pci.c,v 1.17 2012/01/27 18:52:51 para Exp $	*/
 /*
  * Copyright (c) 2002 Fujitsu Component Limited
  * Copyright (c) 2002 Genetec Corporation
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -90,27 +90,27 @@
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 /*
  * PCI configuration support for Samsung s3c2800.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: s3c2800_pci.c,v 1.16 2011/07/01 20:31:39 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: s3c2800_pci.c,v 1.17 2012/01/27 18:52:51 para Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/extent.h>
 #include <sys/malloc.h>
 #include <uvm/uvm_extern.h>
 #include <sys/bus.h>
 #include <arm/s3c2xx0/s3c2800reg.h>
 @@ -283,30 +283,30 @@ sspci_attach(struct device *parent, stru
 		char buf[1000];
 		id_reg = bus_space_read_4(iot, sc->sc_reg_ioh,
 		    PCI_ID_REG);
 		class_reg = bus_space_read_4(iot,
 		    sc->sc_reg_ioh, PCI_CLASS_REG);
 		pci_devinfo(id_reg, class_reg, 1, buf, sizeof(buf));
 		printf("%s: %s\n", self->dv_xname, buf);
+	}
 #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;
 	pci_configure_bus(&sspci_chipset, ioext, memext, NULL, 0,
 	    arm_dcache_align);
 	extent_destroy(memext);
 	extent_destroy(ioext);
 #endif				/* PCI_NETBSD_CONFIGURE */
 	/* initialize bus space tag */
 	sspci_io_tag = *iot;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: becc_pci.c,v 1.10 2011/07/01 20:32:51 dyoung Exp $	*/
+/*	$NetBSD: becc_pci.c,v 1.11 2012/01/27 18:52:51 para Exp $	*/
 /*
  * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -31,27 +31,27 @@
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * PCI configuration support for the ADI Engineering Big Endian Companion
  * Chip.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: becc_pci.c,v 1.10 2011/07/01 20:32:51 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: becc_pci.c,v 1.11 2012/01/27 18:52:51 para Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/extent.h>
 #include <sys/malloc.h>
 #include <uvm/uvm_extern.h>
 #include <sys/bus.h>
 #include <arm/xscale/beccreg.h>
 #include <arm/xscale/beccvar.h>
 @@ -115,30 +115,30 @@ becc_pci_init(pci_chipset_tag_t pc, void
 	/*
 	 * Configure the PCI bus.
+	 *
 	 * XXX We need to revisit this.  We only configure the Secondary
 	 * bus (and its children).  The bus configure code needs changes
 	 * to support how the busses are arranged on this chip.  We also
 	 * need to only configure devices in the private device space on
 	 * the Secondary bus.
 	 */
 	/* 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);
 	extent_destroy(ioext);
 	extent_destroy(memext);
 #endif
+}
 void
 pci_conf_interrupt(pci_chipset_tag_t pc, int a, int b, int c, int d, int *p)
+{
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: i80312_pci.c,v 1.10 2011/07/01 20:32:51 dyoung Exp $	*/
+/*	$NetBSD: i80312_pci.c,v 1.11 2012/01/27 18:52:51 para Exp $	*/
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -30,27 +30,27 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * PCI configuration support for i80312 Companion I/O chip.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i80312_pci.c,v 1.10 2011/07/01 20:32:51 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i80312_pci.c,v 1.11 2012/01/27 18:52:51 para Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/extent.h>
 #include <sys/malloc.h>
 #include <uvm/uvm_extern.h>
 #include <sys/bus.h>
 #include <arm/xscale/i80312reg.h>
 #include <arm/xscale/i80312var.h>
 @@ -98,30 +98,30 @@ i80312_pci_init(pci_chipset_tag_t pc, vo
 	 * XXX We need to revisit this.  We only configure the Secondary
 	 * bus (and its children).  The bus configure code needs changes
 	 * to support how the busses are arranged on this chip.  We also
 	 * need to only configure devices in the private device space on
 	 * the Secondary bus.
 	 */
 	binfo = bus_space_read_4(sc->sc_st, sc->sc_ppb_sh, PPB_REG_BUSINFO);
 	pbus = PPB_BUSINFO_PRIMARY(binfo);
 	sbus = PPB_BUSINFO_SECONDARY(binfo);
 	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);
 	extent_destroy(ioext);
 	extent_destroy(memext);
 #endif
+}
 void
 pci_conf_interrupt(pci_chipset_tag_t pc, int a, int b, int c, int d, int *p)
+{
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: i80321_pci.c,v 1.10 2011/07/01 20:32:51 dyoung Exp $	*/
+/*	$NetBSD: i80321_pci.c,v 1.11 2012/01/27 18:52:51 para Exp $	*/
 /*
  * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -30,27 +30,27 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * PCI configuration support for i80321 I/O Processor chip.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i80321_pci.c,v 1.10 2011/07/01 20:32:51 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i80321_pci.c,v 1.11 2012/01/27 18:52:51 para Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/extent.h>
 #include <sys/malloc.h>
 #include <uvm/uvm_extern.h>
 #include <sys/bus.h>
 #include <arm/xscale/i80321reg.h>
 #include <arm/xscale/i80321var.h>
 @@ -100,36 +100,36 @@ i80321_pci_init(pci_chipset_tag_t pc, vo
 	 * to support how the busses are arranged on this chip.  We also
 	 * need to only configure devices in the private device space on
 	 * the Secondary bus.
 	 */
 	busno = bus_space_read_4(sc->sc_st, sc->sc_atu_sh, ATU_PCIXSR);
 	busno = PCIXSR_BUSNO(busno);
 	if (busno == 0xff)
 		busno = 0;
 	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);
 	pci_configure_bus(pc, ioext, memext, NULL, busno, arm_dcache_align);
 	extent_destroy(ioext);
 	extent_destroy(memext);
 #endif
+}
 void
 pci_conf_interrupt(pci_chipset_tag_t pc, int a, int b, int c, int d, int *p)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ixp425_pci.c,v 1.7 2011/07/01 20:32:51 dyoung Exp $ */
+/*	$NetBSD: ixp425_pci.c,v 1.8 2012/01/27 18:52:51 para Exp $ */
 /*
  * Copyright (c) 2003
  *	Ichiro FUKUHARA <ichiro@ichiro.org>.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -18,27 +18,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL ICHIRO FUKUHARA OR THE VOICES IN HIS HEAD BE LIABLE FOR
  * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixp425_pci.c,v 1.7 2011/07/01 20:32:51 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp425_pci.c,v 1.8 2012/01/27 18:52:51 para Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/extent.h>
 #include <sys/malloc.h>
 #include <uvm/uvm_extern.h>
 #include <sys/bus.h>
 #include <arm/xscale/ixp425reg.h>
 #include <arm/xscale/ixp425var.h>
 @@ -79,32 +79,32 @@ ixp425_pci_init(struct ixp425_softc *sc)
 	pc->pc_make_tag = ixp425_pci_make_tag;
 	pc->pc_decompose_tag = ixp425_pci_decompose_tag;
 	pc->pc_conf_read = ixp425_pci_conf_read;
 	pc->pc_conf_write = ixp425_pci_conf_write;
 	/*
 	 * Initialize the bus space tags.
 	 */
 	ixp425_io_bs_init(&sc->sc_pci_iot, sc);
 	ixp425_mem_bs_init(&sc->sc_pci_memt, sc);
 #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);
 	extent_destroy(ioext);
 	extent_destroy(memext);
 #endif
+}
 void
 pci_conf_interrupt(pci_chipset_tag_t pc, int a, int b, int c, int d, int *p)
+{
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: atari_init.c,v 1.96 2011/11/26 14:05:52 tsutsui Exp $	*/
+/*	$NetBSD: atari_init.c,v 1.97 2012/01/27 18:52:52 para Exp $	*/
 /*
  * Copyright (c) 1995 Leo Weppelman
  * Copyright (c) 1994 Michael L. Hitch
  * Copyright (c) 1993 Markus Wild
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -23,27 +23,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atari_init.c,v 1.96 2011/11/26 14:05:52 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atari_init.c,v 1.97 2012/01/27 18:52:52 para Exp $");
 #include "opt_ddb.h"
 #include "opt_mbtype.h"
 #include "opt_m060sp.h"
 #include "opt_m68k_arch.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/ioctl.h>
 #include <sys/select.h>
 #include <sys/tty.h>
 #include <sys/buf.h>
 #include <sys/msgbuf.h>
 @@ -578,27 +578,27 @@ start_c(int id, u_int ttphystart, u_int
 	 */
 	init_stmem();
 	/*
 	 * Initialize the I/O mem extent map.
 	 * Note: we don't have to check the return value since
 	 * creation of a fixed extent map will never fail (since
 	 * descriptor storage has already been allocated).
+	 *
 	 * N.B. The iomem extent manages _all_ physical addresses
 	 * 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);
 	/*
 	 * Allocate the physical RAM from the extent map
 	 */
 	for (i = 0; boot_segs[i].end != 0; i++) {
 		if (extent_alloc_region(iomem_ex, boot_segs[i].start,
 		    boot_segs[i].end - boot_segs[i].start, EX_NOWAIT)) {
 			/* XXX: Ahum, should not happen ;-) */
 			printf("Warning: Cannot allocate boot memory from"
 			    " extent map!?\n");
+		}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bus.c,v 1.56 2011/07/01 20:34:05 dyoung Exp $	*/
+/*	$NetBSD: bus.c,v 1.57 2012/01/27 18:52:52 para Exp $	*/
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center and by Chris G. Demetriou.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -23,27 +23,27 @@
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include "opt_m68k_arch.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.56 2011/07/01 20:34:05 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.57 2012/01/27 18:52:52 para Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/extent.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/proc.h>
 #include <uvm/uvm.h>
 #include <machine/cpu.h>
 #include <m68k/cacheops.h>
 #define	_ATARI_BUS_DMA_PRIVATE
 @@ -76,27 +76,27 @@ extern paddr_t avail_end;
  */
 static pt_entry_t	*bootm_ptep;
 static long		bootm_ex_storage[EXTENT_FIXED_STORAGE_SIZE(32) /
 								sizeof(long)];
 static struct extent	*bootm_ex;
 void bootm_init(vaddr_t, pt_entry_t *, u_long);
 static vaddr_t	bootm_alloc(paddr_t pa, u_long size, int flags);
 static int	bootm_free(vaddr_t va, u_long size);
 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;
+}
 vaddr_t
 bootm_alloc(paddr_t pa, u_long size, int flags)
+{
 	pt_entry_t	*pg, *epg;
 	pt_entry_t	pg_proto;
 	vaddr_t		va, rva;
 	if (extent_alloc(bootm_ex, size, PAGE_SIZE, 0, EX_NOWAIT, &rva)) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mainbus.c,v 1.28 2011/08/07 15:31:35 kiyohara Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.29 2012/01/27 18:52:52 para Exp $	*/
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
 @@ -21,27 +21,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.28 2011/08/07 15:31:35 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.29 2012/01/27 18:52:52 para Exp $");
 #include <sys/param.h>
 #include <sys/extent.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <machine/autoconf.h>
 #include <sys/bus.h>
 #include "pci.h"
 #include "opt_pci.h"
 #include <dev/pci/pcivar.h>
 @@ -125,29 +125,29 @@ mainbus_attach(device_t parent, device_t
 	KASSERT(genppc_pct != NULL);
 	bebox_pci_get_chipset_tag(genppc_pct);
 	pbi = malloc(sizeof(struct genppc_pci_chipset_businfo),
 	    M_DEVBUF, M_NOWAIT);
 	KASSERT(pbi != NULL);
 	pbi->pbi_properties = prop_dictionary_create();
         KASSERT(pbi->pbi_properties != NULL);
 	SIMPLEQ_INIT(&genppc_pct->pc_pbi);
 	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);
 	extent_destroy(ioext);
 	extent_destroy(memext);
 #endif /* PCI_NETBSD_CONFIGURE */
 #endif /* NPCI */
 #if NPCI > 0
 	memset(&mba, 0, sizeof(mba));
 	mba.mba_pba.pba_iot = &prep_io_space_tag;
 	mba.mba_pba.pba_memt = &prep_mem_space_tag;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: gt.c,v 1.27 2011/07/09 16:09:01 matt Exp $	*/
+/*	$NetBSD: gt.c,v 1.28 2012/01/27 18:52:52 para Exp $	*/
 /*
  * Copyright (c) 2000 Soren S. Jorvang.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions, and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -16,27 +16,27 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gt.c,v 1.27 2011/07/09 16:09:01 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gt.c,v 1.28 2012/01/27 18:52:52 para Exp $");
 #include "opt_pci.h"
 #include "pci.h"
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/extent.h>
 #include <sys/file.h>
 #include <sys/intr.h>
 #include <sys/ioctl.h>
 #include <sys/kernel.h>
 @@ -116,29 +116,29 @@ gt_attach(device_t parent, device_t self
 	    ~PCI_SYNCMODE) | PCI_PCLK_HIGH);
 	(void)bus_space_read_4(sc->sc_bst, sc->sc_bsh, GT_PCI_TIMEOUT_RETRY);
 	bus_space_write_4(sc->sc_bst, sc->sc_bsh, GT_PCI_TIMEOUT_RETRY,
 x00 << PCI_RETRYCTR_SHIFT | 0xff << PCI_TIMEOUT1_SHIFT | 0xff);
 #if NPCI > 0
 	pc = &sc->sc_pc;
 	pc->pc_bst = sc->sc_bst;
 	pc->pc_bsh = sc->sc_bsh;
 #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
 	pba.pba_dmat = &pci_bus_dma_tag;
 	pba.pba_dmat64 = NULL;
 	pba.pba_bus = 0;
 	pba.pba_bridgetag = NULL;
 	pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY |
 		PCI_FLAGS_MRL_OKAY | /*PCI_FLAGS_MRM_OKAY|*/ PCI_FLAGS_MWI_OKAY;
 	pba.pba_pc = pc;
 	config_found_ia(self, "pcibus", &pba, gt_print);
 #endif
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: gapspci_dma.c,v 1.19 2011/07/19 15:52:29 dyoung Exp $	*/
+/*	$NetBSD: gapspci_dma.c,v 1.20 2012/01/27 18:52:53 para Exp $	*/
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -29,27 +29,27 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Bus DMA implementation for the SEGA GAPS PCI bridge.
+ *
  * NOTE: We only implement a small subset of what the bus_space(9)
  * API specifies.  Right now, the GAPS PCI bridge is only used for
  * the Dreamcast Broadband Adatper, so we only provide what the
  * pci(4) and rtk(4) drivers need.
  */
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: gapspci_dma.c,v 1.19 2011/07/19 15:52:29 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gapspci_dma.c,v 1.20 2012/01/27 18:52:53 para Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/mbuf.h>
 #include <sys/extent.h>
 #include <sys/malloc.h>
 #include <sys/bus.h>
 #include <machine/cpu.h>
 #include <dev/pci/pcivar.h>
 @@ -99,27 +99,27 @@ gaps_dma_init(struct gaps_softc *sc)
 	t->_dmamem_alloc = gaps_dmamem_alloc;
 	t->_dmamem_free = gaps_dmamem_free;
 	t->_dmamem_map = gaps_dmamem_map;
 	t->_dmamem_unmap = gaps_dmamem_unmap;
 	t->_dmamem_mmap = gaps_dmamem_mmap;
 	/*
 	 * The GAPS PCI bridge has 32k of DMA memory.  We manage it
 	 * with an extent map.
 	 */
 	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,
 , &sc->sc_dma_memh) != 0)
 		panic("gaps_dma_init: can't map SRAM buffer");
+}
 /*
  * A GAPS DMA map -- has the standard DMA map, plus some extra
  * housekeeping data.
  */
 struct gaps_dmamap {
 	struct dreamcast_bus_dmamap gd_dmamap;
 	void *gd_origbuf;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.5 2011/06/12 03:21:21 tsutsui Exp $	*/
+/*	$NetBSD: machdep.c,v 1.6 2012/01/27 18:52:53 para Exp $	*/
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department, The Mach Operating System project at
  * Carnegie-Mellon University and Ralph Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
 @@ -29,27 +29,27 @@
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)machdep.c	8.3 (Berkeley) 1/12/94
  * 	from: Utah Hdr: machdep.c 1.63 91/04/24
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.5 2011/06/12 03:21:21 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.6 2012/01/27 18:52:53 para Exp $");
 #include "opt_ddb.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/extent.h>
 #include <sys/kernel.h>
 #include <sys/buf.h>
 #include <sys/mbuf.h>
 #include <sys/reboot.h>
 #include <sys/mount.h>
 #include <sys/kcore.h>
 #include <sys/boot_flag.h>
 @@ -328,27 +328,27 @@ void
 mips_machdep_cache_config(void)
+{
+}
 void
 consinit(void)
+{
 	/*
 	 * Init I/O memory extent map. Must be done before cninit()
 	 * is called; we may want to use iospace in the console routines.
 	 */
 	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);
 	/*
 	 * Up until now we have kept the TLB disabled,
 	 * and that allowed the "PROM" to work.
 	 * Specifically, romputc() and the debugger's getc() functions worked.
 	 * Now is the last chance we get to turn it on.
 	 * That means no more console I/O until autoconf() [sigh!], or..
 	 * The platform-specific code will have to map [1:1 probably]
 	 * the I/O registers.
 	 */
 	register_t s = mips_cp0_status_read();

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ifpga.c,v 1.24 2011/05/17 17:34:49 dyoung Exp $ */
+/*	$NetBSD: ifpga.c,v 1.25 2012/01/27 18:52:53 para Exp $ */
 /*
  * Copyright (c) 2001 ARM Ltd
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -28,27 +28,27 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 /*
  * Integrator FPGA core logic support.
+ *
  * The integrator board supports the core logic in an FPGA which is loaded
  * at POR with a custom design.  This code supports the default logic as the
  * board is shipped.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ifpga.c,v 1.24 2011/05/17 17:34:49 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ifpga.c,v 1.25 2012/01/27 18:52:53 para Exp $");
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/device.h>
 #include <sys/systm.h>
 #include <sys/extent.h>
 #include <sys/malloc.h>
 #include <sys/null.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pciconf.h>
 #include <arm/cpufunc.h>
 @@ -286,33 +286,33 @@ ifpga_attach(device_t parent, device_t s
 		char buf[1000];
 		id_reg = bus_space_read_4(pci_sc->sc_memt, pci_sc->sc_reg_ioh,
 		    V360_PCI_VENDOR);
 		class_reg = bus_space_read_4(pci_sc->sc_memt,
 		    pci_sc->sc_reg_ioh, V360_PCI_CC_REV);
 		pci_devinfo(id_reg, class_reg, 1, buf, sizeof(buf));
 		printf("%s: %s\n", device_xname(self), buf);
+	}
 #if defined(PCI_NETBSD_CONFIGURE)
 	ioext = extent_create("pciio", 0x00000000,
-x00000000 + IFPGA_PCI_IO_VSIZE, M_DEVBUF, NULL, 0, EX_NOWAIT);
+x00000000 + 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);
 	extent_destroy(pmemext);
 	extent_destroy(memext);
 	extent_destroy(ioext);
 	printf("pci_configure_bus done\n");
 #endif /* PCI_NETBSD_CONFIGURE */
 #endif /* NPCI > 0 */
 	/* Finally, search for children.  */
 	config_search_ia(ifpga_search, self, "ifpga", NULL);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: isa_io.c,v 1.8 2011/07/01 19:11:34 dyoung Exp $	*/
+/*	$NetBSD: isa_io.c,v 1.9 2012/01/27 18:52:54 para Exp $	*/
 /*
  * Copyright 1997
  * Digital Equipment Corporation. All rights reserved.
+ *
  * This software is furnished under license and may be used and
  * copied only in accordance with the following terms and conditions.
  * Subject to these conditions, you may download, copy, install,
  * use, modify and distribute this software in source and/or binary
  * form. No title or ownership is transferred hereby.
+ *
  * 1) Any source code used, modified or distributed must reproduce
  *    and retain this copyright notice and list of conditions as
 @@ -28,27 +28,27 @@
  *    liable for any damages whatsoever, and in particular, DIGITAL
  *    shall not be liable for special, indirect, consequential, or
  *    incidental damages or damages for lost profits, loss of
  *    revenue or loss of use, whether such damages arise in contract,
  *    negligence, tort, under statute, in equity, at law or otherwise,
  *    even if advised of the possibility of such damage.
  */
 /*
  * bus_space I/O functions for isa
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_io.c,v 1.8 2011/07/01 19:11:34 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_io.c,v 1.9 2012/01/27 18:52:54 para Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/extent.h>
 #include <sys/bus.h>
 #include <machine/pio.h>
 #include <machine/isa_machdep.h>
 /* Proto types for all the bus_space structure functions */
 bs_protos(isa);
 bs_protos(bs_notimpl);
 @@ -232,30 +232,30 @@ void
 isa_bs_mallocok(void)
+{
 	malloc_safe = 1;
+}
 /* bus space functions */
 void
 isa_io_init(vm_offset_t isa_io_addr, vm_offset_t isa_mem_addr)
+{
 	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)
 		panic("isa_io_init(): can't alloc extent maps");
+}
 /*
  * break the abstraction: sometimes, other parts of the system
  * (e.g. X servers) need to map ISA space directly.  use these
  * functions sparingly!
  */
 vm_offset_t
 isa_io_data_vaddr(void)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mainbus.c,v 1.3 2009/08/11 02:32:38 matt Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.4 2012/01/27 18:52:54 para Exp $	*/
 /*
  * Copyright 2002 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Simon Burge for Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -26,27 +26,27 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.3 2009/08/11 02:32:38 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.4 2012/01/27 18:52:54 para Exp $");
 #include "opt_pci.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #if defined(PCI_NETBSD_CONFIGURE)
 #include <sys/extent.h>
 #include <sys/malloc.h>
 #endif
 #include <dev/pci/pcivar.h>
 #if defined(PCI_NETBSD_CONFIGURE)
 @@ -93,29 +93,29 @@ mainbus_match(device_t parent, cfdata_t
 static void
 mainbus_attach(device_t parent, device_t self, void *aux)
+{
 	size_t i;
 	mainbus_found = true;
 	aprint_normal("\n");
 #if defined(PCI_NETBSD_CONFIGURE)
+	{
 		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);
 		extent_destroy(ioext);
 		extent_destroy(memext);
+	}
 #endif /* PCI_NETBSD_CONFIGURE */
 	for (i = 0; i < __arraycount(mainbusdevs); i++) {
 		struct mainbus_attach_args maa;
 		maa.maa_name = mainbusdevs[i];
 		(void) config_found(self, &maa, mainbus_print);
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.9 2011/04/12 00:21:10 matt Exp $	*/
+/*	$NetBSD: machdep.c,v 1.10 2012/01/27 18:52:54 para Exp $	*/
 /*
  * Copyright 2001, 2002 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe and Simon Burge for Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -64,27 +64,27 @@
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)machdep.c   8.3 (Berkeley) 1/12/94
  *	from: Utah Hdr: machdep.c 1.63 91/04/24
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.9 2011/04/12 00:21:10 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.10 2012/01/27 18:52:54 para Exp $");
 #define __INTR_PRIVATE
 #include "opt_multiprocessor.h"
 #include "opt_ddb.h"
 #include "opt_com.h"
 #include "opt_execfmt.h"
 #include "opt_memsize.h"
 #include "rmixl_pcix.h"
 #include "rmixl_pcie.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 @@ -601,27 +601,27 @@ ram_seg_resv(phys_ram_seg_t *segs, u_int
  * what remains can be allocated as needed for other stuff
  * e.g. to configure BARs that are not already initialized and enabled.
  */
 static void
 rmixl_physaddr_init(void)
+{
 	struct extent *ext;
 	unsigned long start = 0UL;
 	unsigned long end = (__BIT(40) / (1024 * 1024)) -1;
 	u_long base;
 	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);
 	if (ext == NULL)
 		panic("%s: extent_create failed", __func__);
 	/*
 	 * grab regions per DRAM BARs
 	 */
 	for (u_int i=0; i < RMIXL_SBC_DRAM_NBARS; i++) {
 		r = RMIXL_IOREG_READ(RMIXL_SBC_DRAM_BAR(i));
 		if ((r & RMIXL_DRAM_BAR_STATUS) == 0)
 			continue;	/* not enabled */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.21 2011/08/02 00:25:38 matt Exp $	*/
+/*	$NetBSD: machdep.c,v 1.22 2012/01/27 18:52:54 para Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Raytheon BBN Technologies Corp and Defense Advanced Research Projects
  * Agency and which was developed by Matt Thomas of 3am Software Foundry.
+ *
  * This material is based upon work supported by the Defense Advanced Research
  * Projects Agency and Space and Naval Warfare Systems Center, Pacific, under
  * Contract No. N66001-09-C-2073.
  * Approved for Public Release, Distribution Unlimited
+ *
 @@ -1359,32 +1359,32 @@ cpu_startup(void)
 	board_info_add_number("tsec2-phy-addr", MII_PHY_ANY);
 	board_info_add_number("tsec3-phy-addr", MII_PHY_ANY);
 	board_info_add_number("tsec4-phy-addr", MII_PHY_ANY);
 #endif
 	uint64_t macstnaddr =
 	    ((uint64_t)le32toh(cpu_read_4(ETSEC1_BASE + MACSTNADDR1)) << 16)
 	    | ((uint64_t)le32toh(cpu_read_4(ETSEC1_BASE + MACSTNADDR2)) << 48);
 	board_info_add_data("tsec-mac-addr-base", &macstnaddr, 6);
 #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();
 	/*
 	 * PCI-Express virtual wire interrupts on combined with
 	 * External IRQ0/1/2/3.
 	 */
 	switch (svr) {
 #if defined(MPC8548)
 	case SVR_MPC8548v1 >> 16:
 		mpc85xx_pci_setup("pcie0-interrupt-map", 0x001800,
 		    IST_LEVEL, 0, 1, 2, 3);
 		break;
 #endif

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bus_space.c,v 1.4 2008/04/28 20:23:18 martin Exp $	*/
+/*	$NetBSD: bus_space.c,v 1.5 2012/01/27 18:52:55 para Exp $	*/
 /*-
  * Copyright (c) 2001, 2004, 2005 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.4 2008/04/28 20:23:18 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.5 2012/01/27 18:52:55 para Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/extent.h>
 #define	_EWS4800MIPS_BUS_SPACE_PRIVATE
 #include <machine/bus.h>
 #include <machine/sbdvar.h>
 #ifdef BUS_SPACE_DEBUG
 int	bus_space_debug = 0;
 #define	DPRINTF(fmt, args...)						\
 @@ -156,27 +156,27 @@ bus_space_create(bus_space_tag_t t, cons
 		return EFAULT;
 	/* set default method */
 	*ebs = _default_bus_space;	/* structure assignment */
 	ebs->ebs_cookie = ebs;
 	/* set access region */
 	if (size == 0) {
 		/* no extent */
 		ebs->ebs_base_addr = addr;
 		ebs->ebs_size = size;
 	} else {
 		ebs->ebs_extent = extent_create(name, addr, addr + size - 1,
-		    M_DEVBUF, 0, 0, EX_NOWAIT);
+, 0, EX_NOWAIT);
 		if (ebs->ebs_extent == NULL) {
 			panic("%s:: unable to create bus_space for "
 			    "0x%08lx-%#lx", __func__, addr, size);
+		}
+	}
 	return 0;
+}
 void
 bus_space_destroy(bus_space_tag_t t)
+{
 	struct ews4800mips_bus_space *ebs = t;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: autoconf.c,v 1.98 2011/05/10 14:38:08 tsutsui Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.99 2012/01/27 18:52:55 para Exp $	*/
 /*-
  * Copyright (c) 1996, 1997, 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -78,27 +78,27 @@
+ *
  *	@(#)autoconf.c	8.2 (Berkeley) 1/12/94
  */
 /*
  * Setup the system to run on the current machine.
+ *
  * Configure() is called at boot time.  Available
  * devices are determined (from possibilities mentioned in ioconf.c),
  * and the drivers are initialized.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.98 2011/05/10 14:38:08 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.99 2012/01/27 18:52:55 para Exp $");
 #include "dvbox.h"
 #include "gbox.h"
 #include "hyper.h"
 #include "rbox.h"
 #include "topcat.h"
 #include "tvrx.h"
 #include "gendiofb.h"
 #include "com_dio.h"
 #include "com_frodo.h"
 #include "dcm.h"
 #include <sys/param.h>
 @@ -890,27 +890,27 @@ dio_scode_probe(int scode, int (*func)(b
 /**********************************************************************
  * Mapping functions
  **********************************************************************/
 /*
  * Initialize the external I/O extent map.
  */
 void
 iomap_init(void)
+{
 	/* 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);
+}
 /*
  * Allocate/deallocate a cache-inhibited range of kernel virtual address
  * space mapping the indicated physical address range [pa - pa+size)
  */
 void *
 iomap(void *pa, int size)
+{
 	u_long kva;
 	int error;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: astro.c,v 1.13 2011/01/13 21:15:13 skrll Exp $	*/
+/*	$NetBSD: astro.c,v 1.14 2012/01/27 18:52:55 para Exp $	*/
 /*	$OpenBSD: astro.c,v 1.8 2007/10/06 23:50:54 krw Exp $	*/
 /*
  * Copyright (c) 2007 Mark Kettenis
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
 @@ -318,27 +318,27 @@ astro_attach(device_t parent, device_t s
 	if (PAGE0->mem_cons.pz_class != PCL_DUPLEX)
 		pdcproc_ioreset();
 	hp700_pagezero_unmap(pagezero_cookie);
 	/* Enable iova space. */
 	r->tlb_ibase = htole32(1);
 	/*
 	 * Now all the hardware's working we need to allocate a dvma map.
 	 */
 	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, EX_NOWAIT);
 	sc->sc_dmatag = astro_dmat;
 	sc->sc_dmatag._cookie = sc;
 	nca = *ca;	/* clone from us */
 	nca.ca_dmatag = &sc->sc_dmatag;
 	nca.ca_hpabase = IOMOD_IO_IO_LOW(p);
 	nca.ca_nmodules = MAXMODBUS;
 	pdc_scanbus(self, &nca, astro_callback);
+}
 static device_t
 astro_callback(device_t self, struct confargs *ca)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: dino.c,v 1.32 2011/05/17 17:34:49 dyoung Exp $ */
+/*	$NetBSD: dino.c,v 1.33 2012/01/27 18:52:55 para Exp $ */
 /*	$OpenBSD: dino.c,v 1.5 2004/02/13 20:39:31 mickey Exp $	*/
 /*
  * Copyright (c) 2003 Michael Shalayeff
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -19,27 +19,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR OR HIS RELATIVES BE LIABLE FOR ANY DIRECT,
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF MIND, USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.32 2011/05/17 17:34:49 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.33 2012/01/27 18:52:55 para Exp $");
 /* #include "cardbus.h" */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/reboot.h>
 #include <sys/malloc.h>
 #include <sys/extent.h>
 #include <machine/iomod.h>
 #include <machine/autoconf.h>
 #include <machine/intr.h>
 @@ -1633,27 +1633,27 @@ dinoattach(device_t parent, device_t sel
 	r->pamr = 0;
 	r->papr = 0;
 	r->io_fbb_en |= 1;
 	r->damode = 0;
 	r->gmask &= ~1;	/* allow GSC bus req */
 	r->pciror = 0;
 	r->pciwor = 0;
 	r->brdg_feat = 0xc0000000;
 #endif
 	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;
+	}
 	/* interrupts guts */
 	s = splhigh();
 	r->icr = 0;
 	r->imr = ~0;
 	data = r->irr0;
 	r->imr = 0;
 	r->iar0 = cpu_gethpa(0) | (31 - ca->ca_irq);
 	splx(s);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: elroy.c,v 1.11 2011/05/17 17:34:49 dyoung Exp $	*/
+/*	$NetBSD: elroy.c,v 1.12 2012/01/27 18:52:56 para Exp $	*/
 /*	$OpenBSD: elroy.c,v 1.5 2009/03/30 21:24:57 kettenis Exp $	*/
 /*
  * Copyright (c) 2005 Michael Shalayeff
  * All rights reserved.
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
 @@ -444,27 +444,27 @@ elroy_alloc_parent(device_t self, struct
 	} else {
 		if (!sc->sc_memex) {
 			bus_space_handle_t memh;
 			bus_addr_t mem_start;
 			if (elroy_memalloc(sc, 0xf0800000, 0xff7fffff,
 			    ELROY_MEM_WINDOW, ELROY_MEM_WINDOW, EX_NOBOUNDARY,
 , &mem_start, &memh))
 				return (NULL);
 			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,
 				    ELROY_MEM_WINDOW);
 				return (NULL);
+			}
+		}
 		ex = sc->sc_memex;
 		tag = pa->pa_memt;
 		start = ex->ex_start;
 		size = ELROY_MEM_CHUNK;
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.104 2012/01/09 19:40:54 skrll Exp $	*/
+/*	$NetBSD: machdep.c,v 1.105 2012/01/27 18:52:56 para Exp $	*/
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matthew Fredette.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -48,27 +48,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR OR HIS RELATIVES BE LIABLE FOR ANY DIRECT,
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF MIND, USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.104 2012/01/09 19:40:54 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.105 2012/01/27 18:52:56 para Exp $");
 #include "opt_cputype.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_modular.h"
 #include "opt_useleds.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/signalvar.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/buf.h>
 @@ -505,27 +505,27 @@ hppa_init(paddr_t start, void *bi)
 	cpuid();
 	ptlball();
 	fcacheall();
 	avail_end = trunc_page(PAGE0->imm_max_mem);
 	totalphysmem = atop(avail_end);
 	if (avail_end > SYSCALLGATE)
 		avail_end = SYSCALLGATE;
 	physmem = atop(avail_end);
 	resvmem = atop(resvmem);	/* XXXNH */
 	/* 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);
 	vstart = round_page(start);
 	/*
 	 * Now allocate kernel dynamic variables
 	 */
 	/* Allocate the msgbuf. */
 	msgbufaddr = (void *) vstart;
 	vstart += MSGBUFSIZE;
 	vstart = round_page(vstart);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bus_space.c,v 1.30 2011/02/26 12:07:45 tsutsui Exp $	*/
+/*	$NetBSD: bus_space.c,v 1.31 2012/01/27 18:52:56 para Exp $	*/
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -21,27 +21,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.30 2011/02/26 12:07:45 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.31 2012/01/27 18:52:56 para Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/extent.h>
 #include <uvm/uvm_extern.h>
 #include <mips/cache.h>
 #include <mips/locore.h>
 #include <mips/pte.h>
 #include <machine/bus.h>
 #include <machine/bus_space_hpcmips.h>
 @@ -206,27 +206,27 @@ hpcmips_init_bus_space(struct bus_space_
 			    "can't allocate kernel virtual");
+		}
 		DPRINTF(("pa:0x%08x -> kv:0x%08x+0x%08x",
 		    (unsigned int)t->base, (unsigned int)va, t->size));
 		t->base = va; /* kseg2 addr */
 		for (; pa < endpa; pa += PAGE_SIZE, va += PAGE_SIZE) {
 			pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE, 0);
+		}
 		pmap_update(pmap_kernel());
+	}
 	t->extent = (void*)extent_create(t->name, t->base,
-	    t->base + t->size, M_DEVBUF,
+	    t->base + t->size,
 , 0, EX_NOWAIT);
 	if (!t->extent) {
 		panic("hpcmips_init_bus_space_extent:"
 		    "unable to allocate %s map", t->name);
+	}
+}
 bus_space_handle_t
 __hpcmips_cacheable(struct bus_space_tag_hpcmips *t, bus_addr_t bpa,
     bus_size_t size, int cacheable)
+{
 	vaddr_t va, endva;
 	pt_entry_t *pte;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tx3912video.c,v 1.40 2009/03/14 15:36:07 dsl Exp $ */
+/*	$NetBSD: tx3912video.c,v 1.41 2012/01/27 18:52:56 para Exp $ */
 /*-
  * Copyright (c) 1999-2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by UCHIYAMA Yasushi.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tx3912video.c,v 1.40 2009/03/14 15:36:07 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tx3912video.c,v 1.41 2012/01/27 18:52:56 para Exp $");
 #define TX3912VIDEO_DEBUG
 #include "hpcfb.h"
 #include "bivideo.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/extent.h>
 #include <sys/ioctl.h>
 #include <sys/buf.h>
 @@ -356,27 +356,27 @@ tx3912video_framebuffer_alloc(struct vid
     paddr_t *fb_end /* buffer allocation hint */)
+{
 	struct extent_fixed ex_fixed[10];
 	struct extent *ex;
 	u_long addr, size;
 	int error;
 	/* calcurate frame buffer size */
 	size = (chip->vc_fbwidth * chip->vc_fbheight * chip->vc_fbdepth) /
 	    NBBY;
 	/* extent V-RAM region */
 	ex = extent_create("Frame buffer address", fb_start, *fb_end,
-, (void *)ex_fixed, sizeof ex_fixed,
+	    (void *)ex_fixed, sizeof ex_fixed,
 	    EX_NOWAIT);
 	if (ex == 0)
 		return (1);
 	/* Allocate V-RAM area */
 	error = extent_alloc_subregion(ex, fb_start, fb_start + size - 1,
 	    size, TX3912_FRAMEBUFFER_ALIGNMENT,
 	    TX3912_FRAMEBUFFER_BOUNDARY, EX_FAST|EX_NOWAIT, &addr);
 	extent_destroy(ex);
 	if (error != 0)
 		return (1);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bus_space.c,v 1.18 2011/07/20 20:46:49 dyoung Exp $	*/
+/*	$NetBSD: bus_space.c,v 1.19 2012/01/27 18:52:57 para Exp $	*/
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.18 2011/07/20 20:46:49 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.19 2012/01/27 18:52:57 para Exp $");
 #include "debug_hpcsh.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/extent.h>
 #include <sys/bus.h>
 /* bus.h turn on BUS_SPACE_DEBUG if the global DEBUG option is enabled. */
 #ifdef	BUS_SPACE_DEBUG
 #define DPRINTF_ENABLE
 #define DPRINTF_DEBUG	bus_space_debug
 @@ -146,27 +146,27 @@ bus_space_create(struct hpcsh_bus_space
 	} else
 		memset(hbs, 0, sizeof(*hbs));
 	KASSERT(hbs);
 	/* set default method */
 	*hbs = __default_bus_space;
 	hbs->hbs_cookie = hbs;
 	/* set access region */
 	if (size == 0) {
 		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, EX_NOWAIT);
 		if (hbs->hbs_extent == NULL) {
 			panic("%s:: unable to create bus_space for "
 			      "0x%08lx-%#lx", __func__, addr, size);
+		}
+	}
 	return hbs;
+}
 void
 bus_space_destroy(bus_space_tag_t t)
+{
 	struct hpcsh_bus_space *hbs = t;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mainbus.c,v 1.10 2011/07/01 20:47:43 dyoung Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.11 2012/01/27 18:52:57 para Exp $	*/
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
 @@ -114,29 +114,29 @@ mainbus_attach(device_t parent, device_t
 	/*
 	 * XXX Note also that the presence of a PCI bus should
 	 * XXX _always_ be checked, and if present the bus should be
 	 * XXX 'found'.  However, because of the structure of the code,
 	 * XXX that's not currently possible.
 	 */
 #if NPCI > 0
 	genppc_pct = malloc(sizeof(struct genppc_pci_chipset), M_DEVBUF,
 	    M_NOWAIT);
 	KASSERT(genppc_pct != NULL);
 	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);
 	extent_destroy(ioext);
 	extent_destroy(memext);
 #endif
 	memset(&mba, 0, sizeof(mba));
 	mba.mba_pba.pba_iot = &prep_io_space_tag;
 	mba.mba_pba.pba_memt = &prep_mem_space_tag;
 	mba.mba_pba.pba_dmat = &pci_bus_dma_tag;
 	mba.mba_pba.pba_dmat64 = NULL;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.342 2011/12/12 19:03:10 mrg Exp $	*/
+/*	$NetBSD: machdep.c,v 1.343 2012/01/27 18:52:57 para Exp $	*/
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1982, 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -64,27 +64,27 @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 /*
  * from: Utah $Hdr: machdep.c 1.63 91/04/24$
+ *
  *	@(#)machdep.c	7.16 (Berkeley) 6/3/91
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.342 2011/12/12 19:03:10 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.343 2012/01/27 18:52:57 para Exp $");
 #include "opt_adb.h"
 #include "opt_ddb.h"
 #include "opt_ddbparam.h"
 #include "opt_kgdb.h"
 #include "opt_modular.h"
 #include "opt_compat_netbsd.h"
 #include "akbd.h"
 #include "macfb.h"
 #include "zsc.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 @@ -268,27 +268,27 @@ mac68k_init(void)
 			    VM_FREELIST_DEFAULT);
+	}
 	/*
 	 * Initialize the I/O mem extent map.
 	 * Note: we don't have to check the return value since
 	 * creation of a fixed extent map will never fail (since
 	 * descriptor storage has already been allocated).
+	 *
 	 * N.B. The iomem extent manages _all_ physical addresses
 	 * 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);
 	/* Initialize the interrupt handlers. */
 	intr_init();
 	/* Initialize the IOPs (if present) */
 	iop_init(1);
 	/*
 	 * Initialize error message buffer (at end of core).
 	 * high[numranges-1] was decremented in pmap_bootstrap.
 	 */

 @@ -1,14 +1,14 @@
-/* $NetBSD: au_himem_space.c,v 1.13 2011/07/10 23:13:23 matt Exp $ */
+/* $NetBSD: au_himem_space.c,v 1.14 2012/01/27 18:52:57 para Exp $ */
 /*-
  * Copyright (c) 2006 Itronix Inc.
  * All rights reserved.
+ *
  * Written by Garrett D'Amore for Itronix Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -51,27 +51,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: au_himem_space.c,v 1.13 2011/07/10 23:13:23 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: au_himem_space.c,v 1.14 2012/01/27 18:52:57 para Exp $");
 /*
  * This provides mappings for the upper I/O regions used on some
  * Alchemy parts, e.g. PCI, PCMCIA, and LCD.  The mappings do not use
  * wired TLB entries, but instead rely on wiring entries in the kernel
  * pmap.
  */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/extent.h>
 #include <sys/malloc.h>
 #include <sys/endian.h>
 @@ -691,27 +691,27 @@ au_himem_space_init(bus_space_tag_t bst,
     paddr_t physoff, bus_addr_t start, bus_addr_t end, int flags)
+{
 	au_himem_cookie_t	*c;
 	c = malloc(sizeof (struct au_himem_cookie), M_DEVBUF,
 	    M_NOWAIT | M_ZERO);
 	c->c_name = name;
 	c->c_start = start;
 	c->c_end = end;
 	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);
 #if	_BYTE_ORDER == _BIG_ENDIAN
 	if (flags & AU_HIMEM_SPACE_LITTLE_ENDIAN) {
 		if (flags & AU_HIMEM_SPACE_SWAP_HW)
 			c->c_hwswap = 1;
 		else
 			c->c_swswap = 1;
+	}
 #elif	_BYTE_ORDER == _LITTLE_ENDIAN

 @@ -1,14 +1,14 @@
-/* $NetBSD: au_wired_space.c,v 1.8 2011/07/10 23:13:23 matt Exp $ */
+/* $NetBSD: au_wired_space.c,v 1.9 2012/01/27 18:52:58 para Exp $ */
 /*-
  * Copyright (c) 2006 Itronix Inc.
  * All rights reserved.
+ *
  * Written by Garrett D'Amore for Itronix Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -51,27 +51,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: au_wired_space.c,v 1.8 2011/07/10 23:13:23 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: au_wired_space.c,v 1.9 2012/01/27 18:52:58 para Exp $");
 /*
  * This provides mappings for the upper I/O regions used on some
  * Alchemy parts, e.g. PCI and PCMCIA spaces.  These spaces can be
  * accessed using wired TLB entries.
  */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/extent.h>
 #include <sys/malloc.h>
 #include <sys/endian.h>
 @@ -631,27 +631,27 @@ au_wired_space_init(bus_space_tag_t bst,
     paddr_t paddr, bus_addr_t start, bus_size_t size, int flags)
+{
 	au_wired_cookie_t	*c;
 	c = malloc(sizeof (struct au_wired_cookie), M_DEVBUF,
 	    M_NOWAIT | M_ZERO);
 	c->c_pbase = paddr;
 	c->c_name = name;
 	c->c_start = start;
 	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);
 #if	_BYTE_ORDER == _BIG_ENDIAN
 	if (flags & AU_WIRED_SPACE_LITTLE_ENDIAN) {
 		if (flags & AU_WIRED_SPACE_SWAP_HW)
 			c->c_hwswap = 1;
 		else
 			c->c_swswap = 1;
+	}
 #elif	_BYTE_ORDER == _LITTLE_ENDIAN

 @@ -1,14 +1,14 @@
-/* $NetBSD: aupci.c,v 1.12 2012/01/03 07:36:02 kiyohara Exp $ */
+/* $NetBSD: aupci.c,v 1.13 2012/01/27 18:52:58 para Exp $ */
 /*-
  * Copyright (c) 2006 Itronix Inc.
  * All rights reserved.
+ *
  * Written by Garrett D'Amore for Itronix Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -25,27 +25,27 @@
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  * ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include "opt_pci.h"
 #include "pci.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aupci.c,v 1.12 2012/01/03 07:36:02 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aupci.c,v 1.13 2012/01/27 18:52:58 para Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/extent.h>
 #include <uvm/uvm_extern.h>
 #include <sys/bus.h>
 @@ -249,30 +249,30 @@ aupciattach(device_t parent, device_t se
 	sc->sc_pc.pc_decompose_tag = aupci_decompose_tag;
 	sc->sc_pc.pc_conf_read = aupci_conf_read;
 	sc->sc_pc.pc_conf_write = aupci_conf_write;
 	sc->sc_pc.pc_intr_v = sc;
 	sc->sc_pc.pc_intr_map = aupci_intr_map;
 	sc->sc_pc.pc_intr_string = aupci_intr_string;
 	sc->sc_pc.pc_intr_establish = aupci_intr_establish;
 	sc->sc_pc.pc_intr_disestablish = aupci_intr_disestablish;
 	sc->sc_pc.pc_conf_interrupt = aupci_conf_interrupt;
 #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);
 	extent_destroy(mem_ex);
 	extent_destroy(io_ex);
 #endif
 	pba.pba_iot = sc->sc_iot;
 	pba.pba_memt = sc->sc_memt;
 	/* XXX: review dma tag logic */
 	pba.pba_dmat = aa->aa_dt;
 	pba.pba_dmat64 = NULL;
 	pba.pba_pc = &sc->sc_pc;

 @@ -1,14 +1,14 @@
-/* $NetBSD: bus_space_alignstride_chipdep.c,v 1.18 2011/09/23 12:42:15 macallan Exp $ */
+/* $NetBSD: bus_space_alignstride_chipdep.c,v 1.19 2012/01/27 18:52:58 para Exp $ */
 /*-
  * Copyright (c) 1998, 2000, 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -71,27 +71,27 @@
  *			declared.
  *	CHIP_EX_STORE_SIZE
  *			Size of the device-provided static storage area
  *			for the memory or I/O memory space extent.
  *	CHIP_LITTLE_ENDIAN | CHIP_BIG_ENDIAN
  *			For endian-specific busses, like PCI (little).
  *	CHIP_ACCESS_SIZE
  *			Size (in bytes) of minimum bus access, e.g. 4
  *			to indicate all bus cycles are 32-bits.  Defaults
  *			to 1, indicating any access size is valid.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_space_alignstride_chipdep.c,v 1.18 2011/09/23 12:42:15 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_space_alignstride_chipdep.c,v 1.19 2012/01/27 18:52:58 para Exp $");
 #ifdef CHIP_EXTENT
 #include <sys/extent.h>
 #endif
 #include <sys/malloc.h>
 #include <mips/locore.h>
 #include <uvm/uvm_extern.h>
 #define	__C(A,B)	__CONCAT(A,B)
 #define	__S(S)		__STRING(S)
 @@ -1246,27 +1246,27 @@ __BS(init)(bus_space_tag_t t, void *v)
 	t->bs_wms_2 =		__BS(write_multi_2);
 	t->bs_wms_4 =		__BS(write_multi_4);
 	t->bs_wms_8 =		__BS(write_multi_8);
 	/* write region, stream */
 	t->bs_wrs_1 =		__BS(write_region_1);
 	t->bs_wrs_2 =		__BS(write_region_2);
 	t->bs_wrs_4 =		__BS(write_region_4);
 	t->bs_wrs_8 =		__BS(write_region_8);
 #endif	/* CHIP_NEED_STREAM */
 #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);
 #ifdef CHIP_W1_BUS_START
 	/*
 	 * The window may be disabled.  We notice this by seeing
 	 * -1 as the bus base address.
 	 */
 	if (CHIP_W1_BUS_START(v) == (bus_addr_t) -1) {
 #ifdef EXTENT_DEBUG
 		printf("%s: this space is disabled\n", __S(__BS(init)));
 #endif
 		return;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rmixl_pcie.c,v 1.8 2011/07/10 23:13:22 matt Exp $	*/
+/*	$NetBSD: rmixl_pcie.c,v 1.9 2012/01/27 18:52:58 para Exp $	*/
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -30,27 +30,27 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * PCI configuration support for RMI XLS SoC
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_pcie.c,v 1.8 2011/07/10 23:13:22 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_pcie.c,v 1.9 2012/01/27 18:52:58 para Exp $");
 #include "opt_pci.h"
 #include "pci.h"
 #include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/extent.h>
 #include <sys/intr.h>
 #include <sys/kernel.h>		/* for 'hz' */
 @@ -693,32 +693,32 @@ rmixl_pcie_init(struct rmixl_pcie_softc
 #if NPCI > 0 && defined(PCI_NETBSD_CONFIGURE)
 	/*
 	 * Configure the PCI bus.
 	 */
 	struct rmixl_config *rcp = &rmixl_configuration;
 	aprint_normal("%s: configuring PCI bus\n",
 		device_xname(sc->sc_dev));
 	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);
 	extent_destroy(ioext);
 	extent_destroy(memext);
 #endif
+}
 static void
 rmixl_pcie_init_ecfg(struct rmixl_pcie_softc *sc)
+{
 	void *v;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bus_space.c,v 1.11 2009/03/18 10:22:32 cegger Exp $ 	*/
+/*	$NetBSD: bus_space.c,v 1.12 2012/01/27 18:52:59 para Exp $ 	*/
 /*
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum and by Jason R. Thorpe of the Numerical Aerospace
  * Simulation Facility, NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -21,27 +21,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.11 2009/03/18 10:22:32 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.12 2012/01/27 18:52:59 para Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/extent.h>
 #include <uvm/uvm_extern.h>
 #include <machine/bus.h>
 void
 mipsco_bus_space_init(bus_space_tag_t bst, const char *name, paddr_t paddr, vaddr_t vaddr, bus_addr_t start, bus_size_t size)
+{
 @@ -59,27 +59,27 @@ mipsco_bus_space_init(bus_space_tag_t bs
 	bst->bs_subregion = mipsco_bus_space_subregion;
 	bst->bs_mmap = mipsco_bus_space_mmap;
 	bst->bs_alloc = mipsco_bus_space_alloc;
 	bst->bs_free = mipsco_bus_space_free;
 	bst->bs_aux = NULL;
 	bst->bs_bswap = 0; /* No byte swap for stream methods */
 	mipsco_bus_space_set_aligned_stride(bst, 0);
+}
 void
 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",
 		  bst->bs_name);
+}
 void
 mipsco_bus_space_set_aligned_stride(bus_space_tag_t bst, unsigned int shift)
 	/* shift:		 log2(alignment) */
+{
 	bst->bs_stride = shift;
 	if (shift == 2) {		/* XXX Assumes Big Endian & 4B */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mainbus.c,v 1.14 2011/07/01 20:49:38 dyoung Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.15 2012/01/27 18:52:59 para Exp $	*/
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
 @@ -21,27 +21,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.14 2011/07/01 20:49:38 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.15 2012/01/27 18:52:59 para Exp $");
 #include <sys/param.h>
 #include <sys/extent.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <machine/autoconf.h>
 #include <sys/bus.h>
 #include "pci.h"
 #include "opt_pci.h"
 #include <dev/pci/pcivar.h>
 @@ -108,29 +108,29 @@ mainbus_attach(device_t parent, device_t
 	KASSERT(genppc_pct != NULL);
 	mvmeppc_pci_get_chipset_tag(genppc_pct);
 	pbi = malloc(sizeof(struct genppc_pci_chipset_businfo),
 	    M_DEVBUF, M_NOWAIT);
 	KASSERT(pbi != NULL);
 	pbi->pbi_properties = prop_dictionary_create();
 	KASSERT(pbi->pbi_properties != NULL);
 	SIMPLEQ_INIT(&genppc_pct->pc_pbi);
 	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);
 	extent_destroy(ioext);
 	extent_destroy(memext);
 #endif
 	pba.pba_iot = &prep_io_space_tag;
 	pba.pba_memt = &prep_mem_space_tag;
 	pba.pba_dmat = &pci_bus_dma_tag;
 	pba.pba_dmat64 = NULL;
 	pba.pba_pc = genppc_pct;

 @@ -1,14 +1,14 @@
-/* $NetBSD: ofwpci.c,v 1.10 2011/06/18 08:08:29 matt Exp $ */
+/* $NetBSD: ofwpci.c,v 1.11 2012/01/27 18:52:59 para Exp $ */
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Tim Rightnour
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofwpci.c,v 1.10 2011/06/18 08:08:29 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofwpci.c,v 1.11 2012/01/27 18:52:59 para Exp $");
 #include "opt_pci.h"
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/extent.h>
 #include <sys/systm.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pciconf.h>
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_pci.h>
 @@ -192,29 +192,29 @@ ofwpci_attach(device_t parent, device_t
 	pbi = malloc(sizeof(struct genppc_pci_chipset_businfo),
 	    M_DEVBUF, M_NOWAIT);
 	KASSERT(pbi != NULL);
 	pbi->pbi_properties = prop_dictionary_create();
 	KASSERT(pbi->pbi_properties != NULL);
 	SIMPLEQ_INIT(&pc->pc_pbi);
 	SIMPLEQ_INSERT_TAIL(&pc->pc_pbi, pbi, next);
 	genofw_setup_pciintr_map((void *)pc, pbi, pc->pc_node);
 #ifdef PCI_NETBSD_CONFIGURE
 	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");
 	extent_destroy(ioext);
 	extent_destroy(memext);
 #endif /* PCI_NETBSD_CONFIGURE */
 	memset(&pba, 0, sizeof(pba));
 	pba.pba_memt = pc->pc_memt;
 	pba.pba_iot = pc->pc_iot;
 	pba.pba_dmat = &pci_bus_dma_tag;
 	pba.pba_dmat64 = NULL;
 	pba.pba_bus = pc->pc_bus;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pq3pci.c,v 1.11 2011/09/27 01:02:35 jym Exp $	*/
+/*	$NetBSD: pq3pci.c,v 1.12 2012/01/27 18:52:59 para Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Raytheon BBN Technologies Corp and Defense Advanced Research Projects
  * Agency and which was developed by Matt Thomas of 3am Software Foundry.
+ *
  * This material is based upon work supported by the Defense Advanced Research
  * Projects Agency and Space and Naval Warfare Systems Center, Pacific, under
  * Contract No. N66001-09-C-2073.
  * Approved for Public Release, Distribution Unlimited
+ *
 @@ -34,27 +34,27 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #define	PCI_PRIVATE
 #define	GLOBAL_PRIVATE
 #define	__INTR_PRIVATE
 #include "opt_mpc85xx.h"
 #include "opt_pci.h"
 #include "locators.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pq3pci.c,v 1.11 2011/09/27 01:02:35 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pq3pci.c,v 1.12 2012/01/27 18:52:59 para Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/cpu.h>
 #include <sys/intr.h>
 #include <sys/bus.h>
 #include <sys/extent.h>
 #include <sys/bitops.h>
 #include <sys/kmem.h>
 #include <sys/malloc.h>	/* for extent */
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 @@ -848,29 +848,29 @@ pq3pci_cpunode_attach(device_t parent, d
 		};
 		bus_space_write_4(sc->sc_bst, sc->sc_bsh, PEXOTAR2, owin2.potar);
 		bus_space_write_4(sc->sc_bst, sc->sc_bsh, PEXOTEAR2, owin2.potear);
 		bus_space_write_4(sc->sc_bst, sc->sc_bsh, PEXOWBAR2, owin2.powbar);
 		bus_space_write_4(sc->sc_bst, sc->sc_bsh, PEXOWAR2, owin2.powar);
 		if (!pq3pci_owin_setup(sc, 2, &owin2)) {
 			aprint_error(
 			    ": error creating bus space for %s\n",
 			    "PCI I/O space");
 			return;
+		}
 		struct extent *ioext = extent_create("pciio", 0, PCI_IOSIZE,
-		     M_DEVBUF, NULL, 0, EX_NOWAIT);
+		     NULL, 0, EX_NOWAIT);
 		struct extent *memext = extent_create("pcimem", membase,
-		     membase + PCI_MEMSIZE, M_DEVBUF, NULL, 0, EX_NOWAIT);
+		     membase + PCI_MEMSIZE, NULL, 0, EX_NOWAIT);
 		error = pci_configure_bus(pc, ioext, memext, NULL, 0,
 		    curcpu()->ci_ci.dcache_line_size);
 		extent_destroy(ioext);
 		extent_destroy(memext);
 		if (error) {
 			aprint_normal(": configuration failed\n");
 			return;
+		}
+	}
 #endif

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pchb.c,v 1.10 2011/06/22 18:06:34 matt Exp $	*/
+/*	$NetBSD: pchb.c,v 1.11 2012/01/27 18:53:00 para Exp $	*/
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -19,27 +19,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.10 2011/06/22 18:06:34 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.11 2012/01/27 18:53:00 para Exp $");
 #include "pci.h"
 #include "opt_pci.h"
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/extent.h>
 #include <sys/malloc.h>
 #define _IBM4XX_BUS_DMA_PRIVATE
 @@ -151,31 +151,31 @@ pchbattach(device_t parent, device_t sel
 	ibm4xx_setup_pci();
 #ifdef PCI_CONFIGURE_VERBOSE
 	ibm4xx_show_pci_map();
 #endif
 	if (bus_space_init(&pchb_io_tag, "pchbio", NULL, 0))
 		panic("pchbattach: can't init IO tag");
 	if (bus_space_init(&pchb_mem_tag, "pchbmem", NULL, 0))
 		panic("pchbattach: can't init MEM tag");
 #ifdef PCI_NETBSD_CONFIGURE
 	struct extent *memext = extent_create("pcimem",
 	    IBM405GP_PCI_MEM_START,
-	    IBM405GP_PCI_MEM_START + 0x1fffffff, M_DEVBUF, NULL, 0,
+	    IBM405GP_PCI_MEM_START + 0x1fffffff, NULL, 0,
 	    EX_NOWAIT);
 	struct extent *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, ioext, memext, NULL, 0, 32);
 	extent_destroy(ioext);
 	extent_destroy(memext);
 #endif /* PCI_NETBSD_CONFIGURE */
 #ifdef PCI_CONFIGURE_VERBOSE
 	printf("running config_found PCI\n");
 #endif
 	/* IO window located @ e8000000 and maps to 0-0xffff */
 	pba.pba_iot = &pchb_io_tag;
 	/* PCI memory window is directly mapped */
 	pba.pba_memt = &pchb_mem_tag;
 	pba.pba_dmat = paa->plb_dmat;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bus_space.c,v 1.29 2011/12/17 19:34:07 phx Exp $	*/
+/*	$NetBSD: bus_space.c,v 1.30 2012/01/27 18:53:00 para Exp $	*/
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -21,27 +21,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.29 2011/12/17 19:34:07 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.30 2012/01/27 18:53:00 para Exp $");
 #define _POWERPC_BUS_SPACE_PRIVATE
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/endian.h>
 #include <sys/extent.h>
 #include <sys/malloc.h>
 #include <sys/bus.h>
 #include <uvm/uvm.h>
 @@ -391,27 +391,27 @@ static int memio_subregion(bus_space_tag
 static void memio_unmap(bus_space_tag_t, bus_space_handle_t, bus_size_t);
 static int memio_alloc(bus_space_tag_t, bus_addr_t, bus_addr_t, bus_size_t,
 	bus_size_t, bus_size_t, int, bus_addr_t *, bus_space_handle_t *);
 static void memio_free(bus_space_tag_t, bus_space_handle_t, bus_size_t);
 static int extent_flags;
 int
 bus_space_init(struct powerpc_bus_space *t, const char *extent_name,
 	void *storage, size_t storage_size)
+{
 	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;
+	}
 	t->pbs_mmap = memio_mmap;
 	t->pbs_map = memio_map;
 	t->pbs_subregion = memio_subregion;
 	t->pbs_unmap = memio_unmap;
 	t->pbs_alloc = memio_alloc;
 	t->pbs_free = memio_free;
 	if (t->pbs_flags & _BUS_SPACE_STRIDE_MASK) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mainbus.c,v 1.32 2011/07/01 20:52:02 dyoung Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.33 2012/01/27 18:53:00 para Exp $	*/
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
 @@ -21,27 +21,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.32 2011/07/01 20:52:02 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.33 2012/01/27 18:53:00 para Exp $");
 #include "opt_pci.h"
 #include "opt_residual.h"
 #include "pnpbus.h"
 #include "pci.h"
 #include "isa.h"
 #include <sys/param.h>
 #include <sys/extent.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 @@ -134,29 +134,29 @@ mainbus_attach(device_t parent, device_t
 	pbi = malloc(sizeof(struct genppc_pci_chipset_businfo),
 	    M_DEVBUF, M_NOWAIT);
 	KASSERT(pbi != NULL);
 	pbi->pbi_properties = prop_dictionary_create();
         KASSERT(pbi->pbi_properties != NULL);
 	SIMPLEQ_INIT(&genppc_pct->pc_pbi);
 	SIMPLEQ_INSERT_TAIL(&genppc_pct->pc_pbi, pbi, next);
 	/* find the primary host bridge */
 	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);
 	extent_destroy(ioext);
 	extent_destroy(memext);
 #endif /* PCI_NETBSD_CONFIGURE */
 #endif /* NPCI */
 /* scan pnpbus first */
 #if NPNPBUS > 0
 	mba.mba_paa.paa_name = "pnpbus";
 	mba.mba_paa.paa_iot = &genppc_isa_io_space_tag;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mainbus.c,v 1.27 2012/01/14 19:39:25 phx Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.28 2012/01/27 18:53:00 para Exp $	*/
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
 @@ -21,27 +21,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.27 2012/01/14 19:39:25 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.28 2012/01/27 18:53:00 para Exp $");
 #include "opt_pci.h"
 #include "pci.h"
 #include <sys/param.h>
 #include <sys/extent.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/systm.h>
 #include <machine/autoconf.h>
 #include <machine/bootinfo.h>
 #include <machine/isa_machdep.h>
 @@ -102,29 +102,29 @@ mainbus_attach(device_t parent, device_t
 	mba.ma_name = "cfi";
 	mba.ma_bst = &sandpoint_flash_space_tag;
 	mba.ma_addr = 0xffe00000; /* smallest flash is 2 MiB */
 	config_found_ia(self, "mainbus", &mba, mainbus_print);
 	/*
 	 * XXX Note also that the presence of a PCI bus should
 	 * XXX _always_ be checked, and if present the bus should be
 	 * XXX 'found'.  However, because of the structure of the code,
 	 * XXX that's not currently possible.
 	 */
 #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);
 	extent_destroy(ioext);
 	extent_destroy(memext);
 #endif
 	pba.pba_iot = &sandpoint_io_space_tag;
 	pba.pba_memt = &sandpoint_mem_space_tag;
 	pba.pba_dmat = &pci_bus_dma_tag;
 	pba.pba_dmat64 = NULL;
 	pba.pba_bus = 0;

 @@ -1,41 +1,41 @@
-/*	$NetBSD: pci_gio.c,v 1.9 2011/07/01 18:53:46 dyoung Exp $	*/
+/*	$NetBSD: pci_gio.c,v 1.10 2012/01/27 18:53:01 para Exp $	*/
 /*
  * Copyright (c) 2006 Stephen M. Rumble
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_gio.c,v 1.9 2011/07/01 18:53:46 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_gio.c,v 1.10 2012/01/27 18:53:01 para Exp $");
 /*
  * Glue for PCI devices that are connected to the GIO bus by various little
  * GIO<->PCI ASICs.
+ *
  * We presently support the following boards:
  *	o Phobos G100/G130/G160	(if_tlp, lxtphy)
  *	o Set Engineering GFE	(if_tl, nsphy)
  */
 #include "opt_pci.h"
 #include "pci.h"
 @@ -204,27 +204,27 @@ giopci_attach(struct device *parent, str
 	pc->pc_conf_hook	= giopci_conf_hook;
 	pc->pc_intr_map		= giopci_intr_map;
 	pc->pc_intr_string	= giopci_intr_string;
 	pc->intr_establish	= giopci_intr_establish;
 	pc->intr_disestablish	= giopci_intr_disestablish;
 	pc->iot			= ga->ga_iot;
 	pc->ioh			= ga->ga_ioh;
 	pc->cookie		= sc;
 	printf(": %s\n", gio_product_string(sc->sc_gprid));
 #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
 	memset(&pba, 0, sizeof(pba));
 	pba.pba_memt	= SGIMIPS_BUS_SPACE_MEM;
 	pba.pba_dmat	= ga->ga_dmat;
 	pba.pba_pc	= pc;
 	pba.pba_flags	= PCI_FLAGS_MEM_OKAY;
 	/* NB: do not set PCI_FLAGS_{MRL,MRM,MWI}_OKAY  -- true ?! */
 	config_found_ia(self, "pcibus", &pba, pcibusprint);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pci_mace.c,v 1.13 2011/07/01 18:53:47 dyoung Exp $	*/
+/*	$NetBSD: pci_mace.c,v 1.14 2012/01/27 18:53:01 para Exp $	*/
 /*
  * Copyright (c) 2001,2003 Christopher Sekiya
  * Copyright (c) 2000 Soren S. Jorvang
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -24,27 +24,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_mace.c,v 1.13 2011/07/01 18:53:47 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_mace.c,v 1.14 2012/01/27 18:53:01 para Exp $");
 #include "opt_pci.h"
 #include "pci.h"
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/systm.h>
 #include <machine/cpu.h>
 #include <machine/locore.h>
 #include <machine/autoconf.h>
 #include <machine/vmparam.h>
 #include <sys/bus.h>
 @@ -136,29 +136,29 @@ macepci_attach(struct device *parent, st
 	    MACE_PCI_CONTROL_TAR_INT |
 	    MACE_PCI_CONTROL_MAR_INT);
 	/*
 	 * Enable all MACE PCI interrupts. They will be masked by
 	 * the CRIME code.
 	 */
 	control = bus_space_read_4(pc->iot, pc->ioh, MACEPCI_CONTROL);
 	control |= CONTROL_INT_MASK;
 	bus_space_write_4(pc->iot, pc->ioh, MACEPCI_CONTROL, control);
 #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);
 /*XXX*/	pba.pba_iot = SGIMIPS_BUS_SPACE_IO;
 /*XXX*/	pba.pba_memt = SGIMIPS_BUS_SPACE_MEM;
 	pba.pba_dmat = &pci_bus_dma_tag;
 	pba.pba_dmat64 = NULL;
 	pba.pba_bus = 0;
 	pba.pba_bridgetag = NULL;
 	pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY |
 	    PCI_FLAGS_MRL_OKAY | PCI_FLAGS_MRM_OKAY | PCI_FLAGS_MWI_OKAY;
 	pba.pba_pc = pc;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: shpcic.c,v 1.16 2012/01/21 19:44:30 nonaka Exp $	*/
+/*	$NetBSD: shpcic.c,v 1.17 2012/01/27 18:53:01 para Exp $	*/
 /*-
  * Copyright (C) 2005 NONAKA Kimihiro <nonaka@netbsd.org>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -16,27 +16,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: shpcic.c,v 1.16 2012/01/21 19:44:30 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: shpcic.c,v 1.17 2012/01/27 18:53:01 para Exp $");
 #include "opt_pci.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/extent.h>
 #include <sys/malloc.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pciconf.h>
 @@ -218,30 +218,30 @@ shpcic_attach(device_t parent, device_t
 				   | PCI_STATUS_DEVSEL_MEDIUM);
 	/* Initialize done. */
 	_reg_write_4(SH4_PCICR, PCICR_BASE | PCICR_CFINIT);
 	/* set PCI controller interrupt priority */
 	intpri_intr_priority(SH4_INTEVT_PCIERR, shpcic_intr_priority[0]);
 	intpri_intr_priority(SH4_INTEVT_PCISERR, shpcic_intr_priority[1]);
 	/* PCI bus */
 #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);
 	extent_destroy(ioext);
 	extent_destroy(memext);
 #endif
 	/* PCI bus */
 	memset(&pba, 0, sizeof(pba));
 	pba.pba_iot = shpcic_get_bus_io_tag();
 	pba.pba_memt = shpcic_get_bus_mem_tag();
 	pba.pba_dmat = shpcic_get_bus_dma_tag();
 	pba.pba_dmat64 = NULL;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: vme_machdep.c,v 1.65 2011/07/18 00:31:13 mrg Exp $	*/
+/*	$NetBSD: vme_machdep.c,v 1.66 2012/01/27 18:53:01 para Exp $	*/
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Paul Kranenburg.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vme_machdep.c,v 1.65 2011/07/18 00:31:13 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vme_machdep.c,v 1.66 2012/01/27 18:53:01 para Exp $");
 #include <sys/param.h>
 #include <sys/extent.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/errno.h>
 #include <sys/proc.h>
 #include <sys/syslog.h>
 #include <uvm/uvm_extern.h>
 @@ -305,27 +305,27 @@ vmeattach_mainbus(device_t parent, devic
 /*XXX*/	sparc_vme_chipset_tag.vct_dmamap_destroy = sparc_vct_dmamap_destroy;
 /*XXX*/	sparc_vme4_dma_tag._cookie = sc;
 	vba.va_vct = &sparc_vme_chipset_tag;
 	vba.va_bdt = &sparc_vme4_dma_tag;
 	vba.va_slaveconfig = 0;
 	/* Fall back to our own `range' construction */
 	sc->sc_range = vmebus_translations;
 	sc->sc_nrange =
 		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, EX_NOWAIT);
 	if (vme_dvmamap == NULL)
 		panic("vme: unable to allocate DVMA map");
 	printf("\n");
 	(void)config_found(self, &vba, 0);
 #endif /* SUN4 */
 	return;
+}
 /* sun4m vmebus */
 static void
 vmeattach_iommu(struct device *parent, struct device *self, void *aux)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: iommu.c,v 1.94 2011/07/17 23:18:23 mrg Exp $ */
+/*	$NetBSD: iommu.c,v 1.95 2012/01/27 18:53:02 para Exp $ */
 /*
  * Copyright (c) 1996
  * 	The President and Fellows of Harvard College. All rights reserved.
  * Copyright (c) 1995 	Paul Kranenburg
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -27,27 +27,27 @@
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iommu.c,v 1.94 2011/07/17 23:18:23 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iommu.c,v 1.95 2012/01/27 18:53:02 para Exp $");
 #include "opt_sparc_arch.h"
 #include <sys/param.h>
 #include <sys/extent.h>
 #include <sys/malloc.h>
 #include <sys/queue.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/proc.h>
 #include <uvm/uvm.h>
 @@ -266,27 +266,27 @@ iommu_attach(device_t parent, device_t s
 	sc->sc_reg->io_bar = (iopte_table_pa >> 4) & IOMMU_BAR_IBA;
 	IOMMU_FLUSHALL(sc);
 	splx(s);
 	printf(": version 0x%x/0x%x, page-size %d, range %dMB\n",
 		(sc->sc_reg->io_cr & IOMMU_CTL_VER) >> 24,
 		(sc->sc_reg->io_cr & IOMMU_CTL_IMPL) >> 28,
 		sc->sc_pagesize,
 		sc->sc_range >> 20);
 	sc->sc_dvmamap = extent_create("iommudvma",
 					IOMMU_DVMA_BASE, IOMMU_DVMA_END,
-					M_DEVBUF, 0, 0, EX_NOWAIT);
+, 0, EX_NOWAIT);
 	if (sc->sc_dvmamap == NULL)
 		panic("iommu: unable to allocate DVMA map");
 	/*
 	 * If we are attaching implicit iommu on JS1/OF we do not have
 	 * an iommu node to traverse, instead mainbus_attach passed us
 	 * sbus node in ma.ma_node.  Attach it as the only iommu child.
 	 */
 	if (js1_implicit_iommu) {
 		struct iommu_attach_args ia;
 		struct openprom_addr sbus_iommu_reg = { 0, 0x10001000, 0x28 };
 		memset(&ia, 0, sizeof ia);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.314 2011/12/12 19:03:11 mrg Exp $ */
+/*	$NetBSD: machdep.c,v 1.315 2012/01/27 18:53:02 para Exp $ */
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -61,27 +61,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)machdep.c	8.6 (Berkeley) 1/14/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.314 2011/12/12 19:03:11 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.315 2012/01/27 18:53:02 para Exp $");
 #include "opt_compat_netbsd.h"
 #include "opt_compat_sunos.h"
 #include "opt_sparc_arch.h"
 #include "opt_modular.h"
 #include "opt_multiprocessor.h"
 #include <sys/param.h>
 #include <sys/signal.h>
 #include <sys/signalvar.h>
 #include <sys/proc.h>
 #include <sys/extent.h>
 #include <sys/savar.h>
 @@ -313,27 +313,27 @@ cpu_startup(void)
 #endif
 #if MAXSSIZ > 256*1024*1024
 		maxsmap = 256*1024*1024;
 #endif
+	}
 	if (CPU_ISSUN4 || CPU_ISSUN4C) {
 		/*
 		 * Allocate DMA map for 24-bit devices (le, ie)
 		 * [dvma_base - dvma_end] is for VME devices..
 		 */
 		dvmamap24 = extent_create("dvmamap24",
 					  D24_DVMA_BASE, D24_DVMA_END,
-					  M_DEVBUF, 0, 0, EX_NOWAIT);
+, 0, EX_NOWAIT);
 		if (dvmamap24 == NULL)
 			panic("unable to allocate DVMA map");
+	}
 #ifdef DEBUG
 	pmapdebug = opmapdebug;
 #endif
 	format_bytes(pbuf, sizeof(pbuf), ptoa(uvmexp.free));
 	printf("avail memory = %s\n", pbuf);
 	pmap_redzone();
 	mutex_init(&fpu_mtx, MUTEX_DEFAULT, IPL_SCHED);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: iommu.c,v 1.105 2011/10/08 08:49:07 nakayama Exp $	*/
+/*	$NetBSD: iommu.c,v 1.106 2012/01/27 18:53:03 para Exp $	*/
 /*
  * Copyright (c) 1999, 2000 Matthew R. Green
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -49,27 +49,27 @@
  * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 /*
  * UltraSPARC IOMMU support; used by both the sbus and pci code.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iommu.c,v 1.105 2011/10/08 08:49:07 nakayama Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iommu.c,v 1.106 2012/01/27 18:53:03 para Exp $");
 #include "opt_ddb.h"
 #include <sys/param.h>
 #include <sys/extent.h>
 #include <sys/malloc.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/proc.h>
 #include <uvm/uvm.h>
 #include <sys/bus.h>
 @@ -190,27 +190,27 @@ iommu_init(char *name, struct iommu_stat
 #endif
 	/*
 	 * Now all the hardware's working we need to allocate a dvma map.
 	 */
 	aprint_debug("DVMA map: %x to %x\n",
 		(unsigned int)is->is_dvmabase,
 		(unsigned int)is->is_dvmaend);
 	aprint_debug("IOTSB: %llx to %llx\n",
 		(unsigned long long)is->is_ptsb,
 		(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, EX_NOWAIT);
 	/* XXXMRG Check is_dvmamap is valid. */
 	/*
 	 * Set the TSB size.  The relevant bits were moved to the TSB
 	 * base register in the PCIe host bridges.
 	 */
 	if (is->is_flags & IOMMU_TSBSIZE_IN_PTSB)
 		is->is_ptsb |= is->is_tsbsize;
 	else
 		is->is_cr |= (is->is_tsbsize << 16);
 	/*
 	 * now actually start up the IOMMU

 @@ -1,14 +1,14 @@
-/*	$NetBSD: psycho.c,v 1.111 2011/09/04 12:17:14 nakayama Exp $	*/
+/*	$NetBSD: psycho.c,v 1.112 2012/01/27 18:53:03 para Exp $	*/
 /*
  * Copyright (c) 1999, 2000 Matthew R. Green
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -45,27 +45,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
  * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: psycho.c,v 1.111 2011/09/04 12:17:14 nakayama Exp $");
+__KERNEL_RCSID(0, "$NetBSD: psycho.c,v 1.112 2012/01/27 18:53:03 para Exp $");
 #include "opt_ddb.h"
 /*
  * Support for `psycho' and `psycho+' UPA to PCI bridge and
  * UltraSPARC IIi and IIe `sabre' PCI controllers.
  */
 #ifdef DEBUG
 #define PDB_PROM	0x01
 #define PDB_BUSMAP	0x02
 #define PDB_INTR	0x04
 #define PDB_INTMAP	0x08
 @@ -786,28 +786,27 @@ psycho_alloc_extent(struct psycho_pbm *p
 		return NULL;
+	}
 	baddr = 0x00000000;
 	bsize = BUS_ADDR(pr->size_hi, pr->size_lo);
 	/* get available lists */
 	num = 0;
 	if (prom_getprop(node, "available", sizeof(*pa), &num, &pa)) {
 		printf("psycho_alloc_extent: no \"available\" property\n");
 		return NULL;
+	}
 	/* create extent */
-	ex = extent_create(name, baddr, bsize - baddr - 1, M_DEVBUF, 0, 0,
+	ex = extent_create(name, baddr, bsize - baddr - 1, 0, 0, EX_NOWAIT);
 			   EX_NOWAIT);
 	if (ex == NULL) {
 		printf("psycho_alloc_extent: extent_create failed\n");
 		goto ret;
+	}
 	/* allocate assigned regions */
 	for (i = 0; i < num; i++)
 		if (((pa[i].phys_hi >> 24) & 0x03) == ss) {
 			/* allocate bus space */
 			addr = BUS_ADDR(pa[i].phys_mid, pa[i].phys_lo);
 			size = BUS_ADDR(pa[i].size_hi, pa[i].size_lo);
 			if (extent_alloc_region(ex, baddr, addr - baddr,
 						EX_NOWAIT)) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.263 2011/12/12 19:03:11 mrg Exp $ */
+/*	$NetBSD: machdep.c,v 1.264 2012/01/27 18:53:03 para Exp $ */
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -61,27 +61,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)machdep.c	8.6 (Berkeley) 1/14/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.263 2011/12/12 19:03:11 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.264 2012/01/27 18:53:03 para Exp $");
 #include "opt_ddb.h"
 #include "opt_multiprocessor.h"
 #include "opt_compat_netbsd.h"
 #include "opt_compat_svr4.h"
 #include "opt_compat_sunos.h"
 #include <sys/param.h>
 #include <sys/extent.h>
 #include <sys/signal.h>
 #include <sys/signalvar.h>
 #include <sys/proc.h>
 #include <sys/sa.h>
 @@ -2294,27 +2294,27 @@ sparc_bus_map(bus_space_tag_t t, bus_add
+{
 	vaddr_t v;
 	uint64_t pa;
 	paddr_t	pm_flags = 0;
 	vm_prot_t pm_prot = VM_PROT_READ;
 	int err, map_little = 0;
 	if (io_space == NULL)
 		/*
 		 * And set up IOSPACE extents.
 		 */
 		io_space = extent_create("IOSPACE",
 					 (u_long)IODEV_BASE, (u_long)IODEV_END,
-					 M_DEVBUF, 0, 0, EX_NOWAIT);
+, 0, EX_NOWAIT);
 	size = round_page(size);
 	if (size == 0) {
 		printf("sparc_bus_map: zero size\n");
 		return (EINVAL);
+	}
 	switch (t->type) {
 	case PCI_CONFIG_BUS_SPACE:
 		/*
 		 * PCI config space is special.
+		 *
 		 * It's really big and seldom used.  In order not to run

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.71 2011/12/12 19:03:11 mrg Exp $	*/
+/*	$NetBSD: machdep.c,v 1.72 2012/01/27 18:53:03 para Exp $	*/
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -139,27 +139,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)machdep.c	8.6 (Berkeley) 1/14/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.71 2011/12/12 19:03:11 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.72 2012/01/27 18:53:03 para Exp $");
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_fpu_emulate.h"
 #include "opt_modular.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/buf.h>
 #include <sys/reboot.h>
 #include <sys/conf.h>
 @@ -348,27 +348,27 @@ cpu_startup(void)
 	/*
 	 * Allocate a virtual page (for use by /dev/mem)
 	 * This page is handed to pmap_enter() therefore
 	 * it has to be in the normal kernel VA range.
 	 */
 	vmmap = uvm_km_alloc(kernel_map, PAGE_SIZE, 0,
 	    UVM_KMF_VAONLY | UVM_KMF_WAITVA);
 	/*
 	 * Allocate DMA map for devices on the bus.
 	 */
 	dvmamap = extent_create("dvmamap",
 	    DVMA_MAP_BASE, DVMA_MAP_BASE + DVMA_MAP_AVAIL,
-	    M_DEVBUF, 0, 0, EX_NOWAIT);
+, 0, EX_NOWAIT);
 	if (dvmamap == NULL)
 		panic("unable to allocate DVMA map");
 	/*
 	 * Set up CPU-specific registers, cache, etc.
 	 */
 	initcpu();
+}
 /*
  * Info for CTL_HW
  */
 char	machine[16] = MACHINE;		/* from <machine/param.h> */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: dvma.c,v 1.36 2009/12/11 13:52:57 tsutsui Exp $	*/
+/*	$NetBSD: dvma.c,v 1.37 2012/01/27 18:53:03 para Exp $	*/
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Gordon W. Ross.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dvma.c,v 1.36 2009/12/11 13:52:57 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dvma.c,v 1.37 2012/01/27 18:53:03 para Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/extent.h>
 #include <sys/buf.h>
 #include <sys/vnode.h>
 #include <sys/core.h>
 #include <sys/exec.h>
 #include <uvm/uvm.h> /* XXX: not _extern ... need uvm_map_create */
 @@ -92,27 +92,27 @@ dvma_init(void)
 	 * The remainder of phys_map is used for DVMA scratch
 	 * memory pages (i.e. driver control blocks, etc.)
 	 */
 	segmap_addr = uvm_km_alloc(phys_map, dvma_segmap_size, 0,
 	    UVM_KMF_VAONLY | UVM_KMF_WAITVA);
 	if (segmap_addr != DVMA_MAP_BASE)
 		panic("dvma_init: unable to allocate DVMA segments");
 	/*
 	 * Create the VM pool used for mapping whole segments
 	 * 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);
+}
 /*
  * Allocate actual memory pages in DVMA space.
  * (idea for implementation borrowed from Chris Torek.)
  */
 void *
 dvma_malloc(size_t bytes)
+{
 	void *new_mem;
 	vsize_t new_size;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: dvma.c,v 1.40 2009/11/21 04:16:53 rmind Exp $	*/
+/*	$NetBSD: dvma.c,v 1.41 2012/01/27 18:53:04 para Exp $	*/
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Gordon W. Ross and Jeremy Cooper.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -59,27 +59,27 @@
  * a specially reserved section of the CPU's virtual address space, 16
  * Megabytes in size.  Whenever a DVMA buffer is allocated, the allocation
  * code will enter in a mapping both in the MC68030 MMU page tables and the
  * I/O mapper.
+ *
  * The address returned by the allocation routine is a virtual address that
  * the requesting driver must use to access the buffer.  It is up to the
  * device driver to convert this virtual address into the appropriate slave
  * address that its device should issue to access the buffer.  (There will be
  * routines that assist the driver in doing so.)
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dvma.c,v 1.40 2009/11/21 04:16:53 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dvma.c,v 1.41 2012/01/27 18:53:04 para Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/extent.h>
 #include <sys/buf.h>
 #include <sys/vnode.h>
 #include <sys/core.h>
 #include <sys/exec.h>
 #include <uvm/uvm_extern.h>
 @@ -104,27 +104,27 @@ __KERNEL_RCSID(0, "$NetBSD: dvma.c,v 1.4
  */
 /* Number of slots in dvmamap. */
 struct extent *dvma_extent;
 void
 dvma_init(void)
+{
 	/*
 	 * 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);
 	/*
 	 * Enable DVMA in the System Enable register.
 	 * Note:  This is only necessary for VME slave accesses.
 	 *        On-board devices are always capable of DVMA.
 	 */
 	*enable_reg |= ENA_SDVMA;
+}
 /*
  * Given a DVMA address, return the physical address that

 @@ -1,14 +1,14 @@
-/* $NetBSD: machdep.c,v 1.184 2012/01/07 16:47:42 chs Exp $	 */
+/* $NetBSD: machdep.c,v 1.185 2012/01/27 18:53:05 para Exp $	 */
 /*
  * Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * Changed for the VAX port (and for readability) /IC
+ *
  * This code is derived from software contributed to Berkeley by the Systems
  * Programming Group of the University of Utah Computer Science Department.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -73,27 +73,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  * from: Utah Hdr: machdep.c 1.63 91/04/24
+ *
  * @(#)machdep.c	7.16 (Berkeley) 6/3/91
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.184 2012/01/07 16:47:42 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.185 2012/01/27 18:53:05 para Exp $");
 #include "opt_ddb.h"
 #include "opt_compat_netbsd.h"
 #include "opt_compat_ultrix.h"
 #include "opt_modular.h"
 #include "opt_multiprocessor.h"
 #include "opt_lockdebug.h"
 #include "opt_compat_ibcs2.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/conf.h>
 @@ -299,27 +299,27 @@ void
 consinit(void)
+{
 	extern vaddr_t iospace;
 	/*
 	 * Init I/O memory extent map. Must be done before cninit()
 	 * is called; we may want to use iospace in the console routines.
+	 *
 	 * NOTE: We need to reserve the first vax-page of iospace
 	 * for the console routines.
 	 */
 	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
 	iospace_inited = 1;
 #endif
 	cninit();
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 	if (symtab_start != NULL && symtab_nsyms != 0 && symtab_end != NULL) {
 		ksyms_addsyms_elf(symtab_nsyms, symtab_start, symtab_end);
+	}
 #endif
 #ifdef DEBUG
 	if (sizeof(struct pcb) > REDZONEADDR)

 @@ -1,14 +1,14 @@
-/* $NetBSD: sgmap.c,v 1.16 2010/12/14 23:44:50 matt Exp $ */
+/* $NetBSD: sgmap.c,v 1.17 2012/01/27 18:53:06 para Exp $ */
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -21,27 +21,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sgmap.c,v 1.16 2010/12/14 23:44:50 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sgmap.c,v 1.17 2012/01/27 18:53:06 para Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/malloc.h>
 #include <uvm/uvm_extern.h>
 #include <machine/sgmap.h>
 void
 @@ -83,27 +83,27 @@ vax_sgmap_init(bus_dma_tag_t t, struct v
 		    BUS_DMA_NOWAIT)) {
 			panic("unable to allocate page table for sgmap `%s'",
 			    name);
 			goto die;
+		}
 		sgmap->aps_pt = (struct pte *)(seg.ds_addr | KERNBASE);
+	}
 	/*
 	 * Create the extent map used to manage the virtual address
 	 * 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;
+	}
 	return;
  die:
 	panic("vax_sgmap_init");
+}
 int
 vax_sgmap_alloc(bus_dmamap_t map, bus_size_t origlen, struct vax_sgmap *sgmap,
 	int flags)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: intio.c,v 1.42 2009/01/18 05:00:39 isaki Exp $	*/
+/*	$NetBSD: intio.c,v 1.43 2012/01/27 18:53:06 para Exp $	*/
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -21,27 +21,27 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * NetBSD/x68k internal I/O virtual bus.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intio.c,v 1.42 2009/01/18 05:00:39 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intio.c,v 1.43 2012/01/27 18:53:06 para Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/extent.h>
 #include <uvm/uvm_extern.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
 #include <machine/frame.h>
 @@ -152,27 +152,27 @@ intio_match(device_t parent, cfdata_t cf
 static void
 intio_attach(device_t parent, device_t self, void *aux)
+{
 	struct intio_softc *sc = device_private(self);
 	struct intio_attach_args ia;
 	intio_attached = 1;
 	aprint_normal(" mapped at %8p\n", intiobase);
 	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;
 	sc->sc_bst->x68k_bus_device = self;
 	sc->sc_dmat = &intio_bus_dma;
 	sc->sc_dmac = 0;
 	memset(iiv, 0, sizeof(struct intio_interrupt_vector) * 256);
 	ia.ia_bst = sc->sc_bst;
 	ia.ia_dmat = sc->sc_dmat;
 	config_search_ia(intio_search, self, "intio", &ia);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pci_addr_fixup.c,v 1.8 2011/08/28 06:08:15 dyoung Exp $	*/
+/*	$NetBSD: pci_addr_fixup.c,v 1.9 2012/01/27 18:53:06 para Exp $	*/
 /*-
  * Copyright (c) 2000 UCHIYAMA Yasushi.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
 @@ -17,27 +17,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_addr_fixup.c,v 1.8 2011/08/28 06:08:15 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_addr_fixup.c,v 1.9 2012/01/27 18:53:06 para Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/extent.h>
 #include <sys/bus.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
 @@ -80,32 +80,32 @@ pci_addr_fixup(pci_chipset_tag_t pc, int
 		const char *name;
 	} system_reserve [] = {
 		{ 0xfec00000, 0x100000, "I/O APIC" },
 		{ 0xfee00000, 0x100000, "Local APIC" },
 		{ 0xfffe0000, 0x20000, "BIOS PROM" },
 		{ 0, 0, 0 }, /* terminator */
 	}, *srp;
 	paddr_t start;
 	int error;
 	pciaddr.extent_mem = extent_create("PCI I/O memory space",
 					   PCIADDR_MEM_START,
 					   PCIADDR_MEM_END,
-					   M_DEVBUF, 0, 0, EX_NOWAIT);
+, 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, EX_NOWAIT);
 	KASSERT(pciaddr.extent_port);
 	/*
 	 * 1. check & reserve system BIOS setting.
 	 */
 	aprint_debug(verbose_header, "System BIOS Setting");
 	pci_device_foreach(pc, maxbus, pciaddr_resource_reserve, NULL);
 	aprint_debug(verbose_footer, pciaddr.nbogus);
 	/*
 	 * 2. reserve non-PCI area.
 	 */
 	for (srp = system_reserve; srp->size; srp++) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bus_space.c,v 1.37 2011/08/25 15:08:49 dyoung Exp $	*/
+/*	$NetBSD: bus_space.c,v 1.38 2012/01/27 18:53:07 para Exp $	*/
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum and by Jason R. Thorpe of the Numerical Aerospace
  * Simulation Facility, NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -21,27 +21,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.37 2011/08/25 15:08:49 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.38 2012/01/27 18:53:07 para Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/extent.h>
 #include <sys/kmem.h>
 #include <uvm/uvm_extern.h>
 #include <dev/isa/isareg.h>
 #include <sys/bus.h>
 #include <machine/pio.h>
 @@ -116,30 +116,30 @@ void
 x86_bus_space_init(void)
+{
 	/*
 	 * Initialize the I/O port and I/O mem extent maps.
 	 * Note: we don't have to check the return value since
 	 * creation of a fixed extent map will never fail (since
 	 * descriptor storage has already been allocated).
+	 *
 	 * N.B. The iomem extent manages _all_ physical addresses
 	 * on the machine.  When the amount of RAM is found, the two
 	 * 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);
 #ifdef XEN
 	/* We are privileged guest os - should have IO privileges. */
 	if (xendomain_is_privileged()) {
 		struct physdev_op physop;
 		physop.cmd = PHYSDEVOP_SET_IOPL;
 		physop.u.set_iopl.iopl = 1;
 		if (HYPERVISOR_physdev_op(&physop) != 0)
 			panic("Unable to obtain IOPL, "
 			    "despite being SIF_PRIVILEGED");
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rbus.c,v 1.28 2009/12/15 22:17:12 snj Exp $	*/
+/*	$NetBSD: rbus.c,v 1.29 2012/01/27 18:53:07 para Exp $	*/
 /*
  * Copyright (c) 1999 and 2000
  *     HAYAKAWA Koichi.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -16,27 +16,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rbus.c,v 1.28 2009/12/15 22:17:12 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rbus.c,v 1.29 2012/01/27 18:53:07 para Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/extent.h>
 #include <sys/bus.h>
 #include <dev/cardbus/rbus.h>
 /* #define RBUS_DEBUG */
 @@ -248,27 +248,27 @@ rbus_new_body(bus_space_tag_t bt, rbus_t
+ *
  *  This function makes a new child rbus instance.
  */
 rbus_tag_t
 rbus_new(rbus_tag_t parent, bus_addr_t start, bus_size_t size, bus_addr_t offset, int flags)
+{
 	rbus_tag_t rb;
 	struct extent *ex = NULL;
 	bus_addr_t end = start + size;
 	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;
+		}
 	} else if (flags == RBUS_SPACE_ASK_PARENT) {
 		ex = NULL;
 	} else {
 		/* Invalid flag */
 		return 0;
+	}
 	rb = rbus_new_body(parent->rb_bt, parent, ex, start, start + size,
 	    offset, flags);
 @@ -285,27 +285,27 @@ rbus_new(rbus_tag_t parent, bus_addr_t s
 /*
  * rbus_tag_t rbus_new_root_delegate(bus_space_tag, bus_addr_t,
  *                                   bus_size_t, bus_addr_t offset)
+ *
  *  This function makes a root rbus instance.
  */
 rbus_tag_t
 rbus_new_root_delegate(bus_space_tag_t bt, bus_addr_t start, bus_size_t size, bus_addr_t offset)
+{
 	rbus_tag_t rb;
 	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;
+	}
 	rb = rbus_new_body(bt, NULL, ex, start, start + size, offset,
 	    RBUS_SPACE_DEDICATE);
 	if (rb == NULL) {
 		extent_destroy(ex);
+	}
 	return rb;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cpc700.c,v 1.18 2011/05/17 17:34:54 dyoung Exp $	*/
+/*	$NetBSD: cpc700.c,v 1.19 2012/01/27 18:53:07 para Exp $	*/
 /*
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net) at Sandburst Corp.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -40,27 +40,27 @@
  *  - two IIC ports
+ *
  *  This driver handles the overall device and enumeration of the
  *  supported subdevices.  NetBSD knows how to handle:
  *  - PCI master
  *  - interrupt controller
  *  - UARTs
  *  Skeleton drivers are provided for the timer and IIC.
+ *
  * XXX This driver assumes that there is only one instance of it.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpc700.c,v 1.18 2011/05/17 17:34:54 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpc700.c,v 1.19 2012/01/27 18:53:07 para Exp $");
 #include "pci.h"
 #include "opt_pci.h"
 #include <sys/param.h>
 #include <sys/extent.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include "locators.h"
 @@ -181,29 +181,29 @@ cpc_attach(device_t self, pci_chipset_ta
 	erren = pci_conf_read(pc, tag, CPC_PCI_BRDGERR);
 	/* Don't generate errors during probe. */
 	pci_conf_write(pc, tag, CPC_PCI_BRDGERR, 0);
 	/* Program MITL */
 	v = pci_conf_read(pc, tag, CPC_BRIDGE_OPTIONS2);
 	v &= ~(CPC_BRIDGE_O2_ILAT_MASK | CPC_BRIDGE_O2_SLAT_MASK);
 	v |= (CPC_BRIDGE_O2_ILAT_PRIM_ASYNC << CPC_BRIDGE_O2_ILAT_SHIFT) |
 	  (CPC_BRIDGE_O2_2LAT_PRIM_ASYNC << CPC_BRIDGE_O2_SLAT_SHIFT);
 	pci_conf_write(pc, tag, CPC_BRIDGE_OPTIONS2, v);
 #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);
 	extent_destroy(ioext);
 	extent_destroy(memext);
 #endif
 	config_found_ia(self, "pcibus", &aa.pba, pcibusprint);
 	/* Restore error triggers, and clear errors */
 	pci_conf_write(pc, tag, CPC_PCI_BRDGERR, erren | CPC_PCI_CLEARERR);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: gtpci.c,v 1.28 2011/05/17 17:34:54 dyoung Exp $	*/
+/*	$NetBSD: gtpci.c,v 1.29 2012/01/27 18:53:08 para Exp $	*/
 /*
  * Copyright (c) 2008, 2009 KIYOHARA Takashi
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -16,27 +16,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gtpci.c,v 1.28 2011/05/17 17:34:54 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gtpci.c,v 1.29 2012/01/27 18:53:08 para Exp $");
 #include "opt_pci.h"
 #include "pci.h"
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/errno.h>
 #include <sys/extent.h>
 #include <sys/malloc.h>
 #include <prop/proplib.h>
 @@ -444,30 +444,28 @@ gtpci_pci_config(struct gtpci_softc *sc,
 		 bus_space_tag_t memt, bus_dma_tag_t dmat, pci_chipset_tag_t pc,
 		 u_long iostart, u_long ioend, u_long memstart, u_long memend,
 		 int cacheline_size)
+{
 	struct pcibus_attach_args pba;
 #ifdef PCI_NETBSD_CONFIGURE
 	struct extent *ioext = NULL, *memext = NULL;
 #endif
 	uint32_t p2pc, command;
 	p2pc = GTPCI_READ(sc, GTPCI_P2PC);
 #ifdef PCI_NETBSD_CONFIGURE
-	ioext = extent_create("pciio", iostart, ioend, M_DEVBUF, NULL, 0,
+	ioext = extent_create("pciio", iostart, ioend, NULL, 0, EX_NOWAIT);
-	    EX_NOWAIT);
+	memext = extent_create("pcimem", memstart, memend, NULL, 0, EX_NOWAIT);
 	memext = extent_create("pcimem", memstart, memend, M_DEVBUF, NULL, 0,
 	    EX_NOWAIT);
 	if (ioext != NULL && memext != NULL)
 		pci_configure_bus(pc, ioext, memext, NULL,
 		    GTPCI_P2PC_BUSNUMBER(p2pc), cacheline_size);
 	else
 		aprint_error_dev(sc->sc_dev, "can't create extent %s%s%s\n",
 		    ioext == NULL ? "io" : "",
 		    ioext == NULL && memext == NULL ? " and " : "",
 		    memext == NULL ? "mem" : "");
 	if (ioext != NULL)
 		extent_destroy(ioext);
 	if (memext != NULL)
 		extent_destroy(memext);
 #endif

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mvpex.c,v 1.5 2011/05/17 17:34:54 dyoung Exp $	*/
+/*	$NetBSD: mvpex.c,v 1.6 2012/01/27 18:53:08 para Exp $	*/
 /*
  * Copyright (c) 2008 KIYOHARA Takashi
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -16,27 +16,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mvpex.c,v 1.5 2011/05/17 17:34:54 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mvpex.c,v 1.6 2012/01/27 18:53:08 para Exp $");
 #include "opt_pci.h"
 #include "pci.h"
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/errno.h>
 #include <sys/extent.h>
 #include <sys/evcnt.h>
 #include <sys/malloc.h>
 #include <sys/systm.h>
 @@ -407,30 +407,28 @@ mvpex_pci_config(struct mvpex_softc *sc,
 		 bus_space_tag_t memt, bus_dma_tag_t dmat, pci_chipset_tag_t pc,
 		 u_long iostart, u_long ioend, u_long memstart, u_long memend,
 		 int cacheline_size)
+{
 	struct pcibus_attach_args pba;
 #ifdef PCI_NETBSD_CONFIGURE
 	struct extent *ioext = NULL, *memext = NULL;
 #endif
 	uint32_t stat;
 	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,
+	ioext = extent_create("pexio", iostart, ioend, NULL, 0, EX_NOWAIT);
-	    EX_NOWAIT);
+	memext = extent_create("pexmem", memstart, memend, NULL, 0, EX_NOWAIT);
 	memext = extent_create("pexmem", memstart, memend, M_DEVBUF, NULL, 0,
 	    EX_NOWAIT);
 	if (ioext != NULL && memext != NULL)
 		pci_configure_bus(pc, ioext, memext, NULL,
 		    MVPEX_STAT_PEXBUSNUM(stat), cacheline_size);
         else
 		aprint_error_dev(sc->sc_dev, "can't create extent %s%s%s\n",
 		    ioext == NULL ? "io" : "",
 		    ioext == NULL && memext == NULL ? " and " : "",
 		    memext == NULL ? "mem" : "");
 	if (ioext != NULL)
 		extent_destroy(ioext);
 	if (memext != NULL)
 		extent_destroy(memext);
 #endif

 @@ -1,14 +1,14 @@
-/* $NetBSD: btvmei.c,v 1.26 2009/11/26 15:17:08 njoly Exp $ */
+/* $NetBSD: btvmei.c,v 1.27 2012/01/27 18:53:08 para Exp $ */
 /*
  * Copyright (c) 1999
  *	Matthias Drochner.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -19,27 +19,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btvmei.c,v 1.26 2009/11/26 15:17:08 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btvmei.c,v 1.27 2012/01/27 18:53:08 para Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/bus.h>
 #include <sys/extent.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 @@ -293,36 +293,36 @@ b3_617_init(struct b3_617_softc *sc)
 	/* all maps invalid */
 	for (i = MR_PCI_VME; i < MR_PCI_VME + MR_PCI_VME_SIZE; i += 4)
 		write_mapmem(sc, i, MR_RAM_INVALID);
 	for (i = MR_VME_PCI; i < MR_VME_PCI + MR_VME_PCI_SIZE; i += 4)
 		write_mapmem(sc, i, MR_RAM_INVALID);
 	for (i = MR_DMA_PCI; i < MR_DMA_PCI + MR_DMA_PCI_SIZE; i += 4)
 		write_mapmem(sc, i, MR_RAM_INVALID);
 	/*
 	 * 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
 	/*
 	 * init int handler queue,
 	 * enable interrupts if PCI interrupt available
 	 */
 	TAILQ_INIT(&(sc->intrhdls));
 	sc->strayintrs = 0;
 	if (sc->sc_ih)
 		write_csr_byte(sc, LOC_INT_CTRL, LIC_INT_ENABLE);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pciconf.c,v 1.33 2011/08/24 20:27:35 dyoung Exp $	*/
+/*	$NetBSD: pciconf.c,v 1.34 2012/01/27 18:53:08 para Exp $	*/
 /*
  * Copyright 2001 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Allen Briggs for Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -55,27 +55,27 @@
  *    - Deal with "anything can be hot-plugged" -- i.e., carry configuration
  *	information around & be able to reconfigure on the fly
  *    - Deal with segments (See IA64 System Abstraction Layer)
  *    - Deal with subtractive bridges (& non-spec positive/subtractive decode)
  *    - Deal with ISA/VGA/VGA palette snooping
  *    - Deal with device capabilities on bridges
  *    - Worry about changing a bridge to/from transparency
  * From thorpej (05/25/01)
  *    - Try to handle devices that are already configured (perhaps using that
  *      as a hint to where we put other devices)
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pciconf.c,v 1.33 2011/08/24 20:27:35 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciconf.c,v 1.34 2012/01/27 18:53:08 para Exp $");
 #include "opt_pci.h"
 #include <sys/param.h>
 #include <sys/extent.h>
 #include <sys/queue.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/kmem.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pciconf.h>
 #include <dev/pci/pcidevs.h>
 @@ -698,27 +698,27 @@ setup_iowins(pciconf_bus_t *pb)
 			continue;
 		pd = pi->dev;
 		pi->address = pci_allocate_range(pb->ioext, pi->size,
 		    pi->align);
 		if (pi->address == -1) {
 			print_tag(pd->pc, pd->tag);
 			printf("Failed to allocate PCI I/O space (%"
 			    PRIu64 " req)\n", pi->size);
 			return -1;
+		}
 		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);
 				printf("Failed to alloc I/O ext. for bus %d\n",
 				    pd->ppb->busno);
 				return -1;
+			}
 			continue;
+		}
 		if (!pb->io_32bit && pi->address > 0xFFFF) {
 			pi->address = 0;
 			pd->enable &= ~PCI_CONF_ENABLE_IO;
 		} else {
 @@ -749,28 +749,27 @@ setup_memwins(pciconf_bus_t *pb)
 		pd = pm->dev;
 		ex = (pm->prefetch) ? pb->pmemext : pb->memext;
 		pm->address = pci_allocate_range(ex, pm->size, pm->align);
 		if (pm->address == -1) {
 			print_tag(pd->pc, pd->tag);
 			printf(
 			   "Failed to allocate PCI memory space (%" PRIu64
 			   " req)\n", pm->size);
 			return -1;
+		}
 		if (pd->ppb && pm->reg == 0) {
 			ex = extent_create("pciconf", pm->address,
-			    pm->address + pm->size, M_DEVBUF, NULL, 0,
+			    pm->address + pm->size, NULL, 0, EX_NOWAIT);
 			    EX_NOWAIT);
 			if (ex == NULL) {
 				print_tag(pd->pc, pd->tag);
 				printf("Failed to alloc MEM ext. for bus %d\n",
 				    pd->ppb->busno);
 				return -1;
+			}
 			if (pm->prefetch) {
 				pd->ppb->pmemext = ex;
 			} else {
 				pd->ppb->memext = ex;
+			}
 			continue;
+		}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: usb_mem.c,v 1.50 2011/09/27 01:02:38 jym Exp $	*/
+/*	$NetBSD: usb_mem.c,v 1.51 2012/01/27 18:53:09 para Exp $	*/
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net) at
  * Carlstedt Research & Technology.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -28,27 +28,27 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * USB DMA memory allocation.
  * We need to allocate a lot of small (many 8 byte, some larger)
  * memory blocks that can be used for DMA.  Using the bus_dma
  * routines directly would incur large overheads in space and time.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb_mem.c,v 1.50 2011/09/27 01:02:38 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_mem.c,v 1.51 2012/01/27 18:53:09 para Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/queue.h>
 #include <sys/device.h>		/* for usbdivar.h */
 #include <sys/bus.h>
 #include <sys/cpu.h>
 @@ -422,28 +422,27 @@ usb_setup_reserve(device_t dv, struct us
 	error = bus_dmamap_create(dtag, USB_MEM_RESERVE, 1,
 	    USB_MEM_RESERVE, 0, BUS_DMA_NOWAIT, &rs->map);
 	if (error != 0)
 		goto unmap;
 	error = bus_dmamap_load(dtag, rs->map, rs->vaddr, USB_MEM_RESERVE,
 	    NULL, BUS_DMA_NOWAIT);
 	if (error != 0)
 		goto destroy;
 	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),
+	    (u_long)(rs->paddr + USB_MEM_RESERVE - 1), 0, 0, 0);
 	    M_USB, 0, 0, 0);
 	if (rs->extent == NULL) {
 		rs->vaddr = 0;
 		return ENOMEM;
+	}
 	return 0;
  destroy:
 	bus_dmamap_destroy(dtag, rs->map);
  unmap:
 	bus_dmamem_unmap(dtag, rs->vaddr, size);
  freeit:
 	bus_dmamem_free(dtag, &seg, nseg);

 @@ -1,14 +1,14 @@
-/* $NetBSD: vme.c,v 1.24 2010/12/11 18:12:45 matt Exp $ */
+/* $NetBSD: vme.c,v 1.25 2012/01/27 18:53:09 para Exp $ */
 /*
  * Copyright (c) 1999
  *	Matthias Drochner.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -19,27 +19,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vme.c,v 1.24 2010/12/11 18:12:45 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vme.c,v 1.25 2012/01/27 18:53:09 para Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/extent.h>
 #include <sys/bus.h>
 #include <dev/vme/vmereg.h>
 #include <dev/vme/vmevar.h>
 static void vme_extractlocators(int*, struct vme_attach_args*);
 static int vmeprint(struct vme_attach_args*, char*);
 @@ -177,42 +177,39 @@ vmeattach(device_t parent, device_t self
 	sc->sc_vct = aa->va_vct;
 	sc->sc_bdt = aa->va_bdt;
 	/* the "bus" are we ourselves */
 	sc->sc_vct->bus = sc;
 	sc->slaveconfig = aa->va_slaveconfig;
 	printf("\n");
 	/*
 	 * set up address space accounting - assume incomplete decoding
 	 */
-	sc->vme32ext = extent_create("vme32", 0, 0xffffffff,
+	sc->vme32ext = extent_create("vme32", 0, 0xffffffff, 0, 0, 0);
 				     M_DEVBUF, 0, 0, 0);
 	if (!sc->vme32ext) {
 		printf("error creating A32 map\n");
 		return;
+	}
-	sc->vme24ext = extent_create("vme24", 0, 0x00ffffff,
+	sc->vme24ext = extent_create("vme24", 0, 0x00ffffff, 0, 0, 0);
 				     M_DEVBUF, 0, 0, 0);
 	if (!sc->vme24ext) {
 		printf("error creating A24 map\n");
 		return;
+	}
-	sc->vme16ext = extent_create("vme16", 0, 0x0000ffff,
+	sc->vme16ext = extent_create("vme16", 0, 0x0000ffff, 0, 0, 0);
 				     M_DEVBUF, 0, 0, 0);
 	if (!sc->vme16ext) {
 		printf("error creating A16 map\n");
 		return;
+	}
 	if (sc->slaveconfig) {
 		/* first get info about the bus master's slave side,
 		 if present */
 		config_search_ia(vmesubmatch1, self, "vme", 0);
+	}
 	config_search_ia(vmesubmatch, self, "vme", 0);
 #ifdef VMEDEBUG

 @@ -1,14 +1,14 @@
-/*	$NetBSD: subr_extent.c,v 1.72 2008/04/28 20:24:04 martin Exp $	*/
+/*	$NetBSD: subr_extent.c,v 1.73 2012/01/27 18:53:09 para Exp $	*/
 /*-
  * Copyright (c) 1996, 1998, 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe and Matthias Drochner.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -24,34 +24,34 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * General purpose extent manager.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_extent.c,v 1.72 2008/04/28 20:24:04 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_extent.c,v 1.73 2012/01/27 18:53:09 para Exp $");
 #ifdef _KERNEL
 #include "opt_lockdebug.h"
 #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>
 #include <sys/proc.h>
 #include <uvm/uvm_extern.h>
 #define	KMEM_IS_RUNNING		(kmem_map != NULL)
 #elif defined(_EXTENT_TESTING)
 /*
  * user-land definitions, so it can fit into a testing harness.
  */
 #include <sys/param.h>
 @@ -59,35 +59,35 @@ __KERNEL_RCSID(0, "$NetBSD: subr_extent.
 #include <sys/extent.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 /*
  * Use multi-line #defines to avoid screwing up the kernel tags file;
  * without this, ctags produces a tags file where panic() shows up
  * 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)
 #define	mutex_destroy(a)
 #define	mutex_enter(l)
 #define	mutex_exit(l)
 #define	cv_wait(cv, lock)
 #define	cv_broadcast(cv)
 #define	cv_init(a, b)
 #define	cv_destroy(a)
 #define	KMEM_IS_RUNNING			(1)
 #define	IPL_VM				(0)
 #define	MUTEX_DEFAULT			(0)
 @@ -225,27 +225,27 @@ extent_free_region_descriptor(struct ext
+	}
 	/*
 	 * We know it's dynamically allocated if we get here.
 	 */
 	pool_put(&expool, rp);
+}
 /*
  * Allocate and initialize an extent map.
  */
 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;
 	size_t sz = storagesize;
 	struct extent_region *rp;
 	int fixed_extent = (storage != NULL);
 #ifndef _KERNEL
 	extent_init();
 #endif
 #ifdef DIAGNOSTIC
 	/* Check arguments. */
 @@ -281,40 +281,39 @@ extent_create(const char *name, u_long s
 		/*
 		 * In a fixed extent, we have to pre-allocate region
 		 * descriptors and place them in the extent's freelist.
 		 */
 		LIST_INIT(&fex->fex_freelist);
 		while (sz >= ALIGN(sizeof(struct extent_region))) {
 			rp = (struct extent_region *)cp;
 			cp += ALIGN(sizeof(struct extent_region));
 			sz -= ALIGN(sizeof(struct extent_region));
 			LIST_INSERT_HEAD(&fex->fex_freelist, rp, er_link);
+		}
 	} else {
-		ex = (struct extent *)malloc(sizeof(struct extent),
+		ex = (struct extent *)kmem_alloc(sizeof(struct extent),
-		    mtype, (flags & EX_WAITOK) ? M_WAITOK : M_NOWAIT);
+		    (flags & EX_WAITOK) ? KM_SLEEP : KM_NOSLEEP);
 		if (ex == NULL)
 			return (NULL);
+	}
 	/* Fill in the extent descriptor and return it to the caller. */
 	mutex_init(&ex->ex_lock, MUTEX_DEFAULT, IPL_VM);
 	cv_init(&ex->ex_cv, "extent");
 	LIST_INIT(&ex->ex_regions);
 	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;
 	if (flags & EX_NOCOALESCE)
 		ex->ex_flags |= EXF_NOCOALESCE;
 	return (ex);
+}
 /*
  * Destroy an extent map.
  * Since we're freeing the data, there can't be any references
  * so we don't need any locking.
  */
 @@ -332,27 +331,27 @@ extent_destroy(struct extent *ex)
 	/* Free all region descriptors in extent. */
 	for (rp = LIST_FIRST(&ex->ex_regions); rp != NULL; ) {
 		orp = rp;
 		rp = LIST_NEXT(rp, er_link);
 		LIST_REMOVE(orp, er_link);
 		extent_free_region_descriptor(ex, orp);
+	}
 	cv_destroy(&ex->ex_cv);
 	mutex_destroy(&ex->ex_lock);
 	/* 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));
+}
 /*
  * Insert a region descriptor into the sorted region list after the
  * entry "after" or at the head of the list (if "after" is NULL).
  * The region descriptor we insert is passed in "rp".  We must
  * allocate the region descriptor before calling this function!
  * If we don't need the region descriptor, it will be freed here.
  */
 static void
 extent_insert_and_optimize(struct extent *ex, u_long start, u_long size,
     int flags, struct extent_region *after, struct extent_region *rp)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: extent.h,v 1.18 2008/04/28 20:24:10 martin Exp $	*/
+/*	$NetBSD: extent.h,v 1.19 2012/01/27 18:53:10 para Exp $	*/
 /*-
  * Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -44,72 +44,69 @@ struct extent_region {
 };
 /* er_flags */
 #define ER_ALLOC	0x01	/* region descriptor dynamically allocated */
 struct extent {
 	const char *ex_name;		/* name of extent */
 	kmutex_t ex_lock;		/* lock on this extent */
 	kcondvar_t ex_cv;		/* synchronization */
 					/* allocated regions in extent */
 	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 */
 };
 struct extent_fixed {
 	struct extent	fex_extent;	/* MUST BE FIRST */
 					/* freelist of region descriptors */
 	LIST_HEAD(, extent_region) fex_freelist;
 	void *		fex_storage;	/* storage space for descriptors */
 	size_t		fex_storagesize; /* size of storage space */
 };
 /* ex_flags; for internal use only */
 #define EXF_FIXED	0x01		/* extent uses fixed storage */
 #define EXF_NOCOALESCE	0x02		/* coalescing of regions not allowed */
 #define EXF_FLWANTED	0x08		/* someone asleep on freelist */
 #define EXF_BITS	"\20\4FLWANTED\2NOCOALESCE\1FIXED"
 /* misc. flags passed to extent functions */
 #define EX_NOWAIT	0x00		/* not safe to sleep */
 #define EX_WAITOK	0x01		/* safe to sleep */
 #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 */
 /*
  * Special place holders for "alignment" and "boundary" arguments,
  * in the event the caller doesn't wish to use those features.
  */
 #define EX_NOALIGN	1		/* don't do alignment */
 #define EX_NOBOUNDARY	0		/* don't do boundary checking */
 #if defined(_KERNEL) || defined(_EXTENT_TESTING)
 #define EXTENT_FIXED_STORAGE_SIZE(_nregions)		\
 	(ALIGN(sizeof(struct extent_fixed)) +		\
 	((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 *);
 int	extent_alloc_subregion(struct extent *, u_long, u_long,
 	    u_long, u_long, u_long, int, u_long *);
 int	extent_alloc_region(struct extent *, u_long, u_long, int);
 int	extent_alloc1(struct extent *, u_long, u_long, u_long, u_long, int,
 	    u_long *);
 int	extent_alloc(struct extent *, u_long, u_long, u_long, int, u_long *);
 int	extent_free(struct extent *, u_long, u_long, int);
 void	extent_print(struct extent *);
 void	extent_init(void);

 @@ -1,14 +1,14 @@
-/* $NetBSD: t_extent.c,v 1.3 2011/06/11 18:03:17 christos Exp $ */
+/* $NetBSD: t_extent.c,v 1.4 2012/01/27 18:53:10 para Exp $ */
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -19,46 +19,46 @@
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 __COPYRIGHT("@(#) Copyright (c) 2008\
  The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_extent.c,v 1.3 2011/06/11 18:03:17 christos Exp $");
+__RCSID("$NetBSD: t_extent.c,v 1.4 2012/01/27 18:53:10 para Exp $");
 #include <sys/types.h>
 #include <sys/queue.h>
 #include <sys/extent.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <atf-c.h>
 #include "../h_macros.h"
 static int ret;
 static struct extent *ex;
 #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, \
 	    start, size, 0), 0, "%s", strerror(ret));
 #define h_free(start, size) \
 	ATF_REQUIRE_EQ_MSG(ret = extent_free(ex, \
 	    start, size, 0), 0, "%s", strerror(ret));
 static void
 h_alloc_subregion(u_long substart, u_long subend, u_long size,
     u_long alignment, u_long boundary, int expret, u_long expres)
+{