Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src converting extent(9) from malloc(9) to kmem(9)
details: https://anonhg.NetBSD.org/src/rev/9d906ab1fc4a
branches: trunk
changeset: 773083:9d906ab1fc4a
user: para <para%NetBSD.org@localhost>
date: Fri Jan 27 18:52:47 2012 +0000
description:
converting extent(9) from malloc(9) to kmem(9)
preceding kmem-vmem-pool-uvm patch
releng@ acknowledged
diffstat:
sys/arch/algor/dev/mainbus.c | 16 +++++++-------
sys/arch/alpha/common/sgmap_common.c | 6 ++--
sys/arch/alpha/pci/pci_bwx_bus_io_chipdep.c | 6 ++--
sys/arch/alpha/pci/pci_bwx_bus_mem_chipdep.c | 6 ++--
sys/arch/alpha/pci/pci_swiz_bus_io_chipdep.c | 6 ++--
sys/arch/alpha/pci/pci_swiz_bus_mem_chipdep.c | 8 +++---
sys/arch/arc/arc/bus_space.c | 6 ++--
sys/arch/arc/arc/wired_map_machdep.c | 6 ++--
sys/arch/arc/jazz/jazzdmatlb.c | 7 ++---
sys/arch/arc/pci/necpb.c | 8 +++---
sys/arch/arm/gemini/gemini_pci.c | 8 +++---
sys/arch/arm/ixp12x0/ixp12x0_pci.c | 8 +++---
sys/arch/arm/s3c2xx0/s3c2800_pci.c | 8 +++---
sys/arch/arm/xscale/becc_pci.c | 8 +++---
sys/arch/arm/xscale/i80312_pci.c | 8 +++---
sys/arch/arm/xscale/i80321_pci.c | 10 ++++----
sys/arch/arm/xscale/ixp425_pci.c | 8 +++---
sys/arch/atari/atari/atari_init.c | 6 ++--
sys/arch/atari/atari/bus.c | 6 ++--
sys/arch/bebox/bebox/mainbus.c | 8 +++---
sys/arch/cobalt/dev/gt.c | 8 +++---
sys/arch/dreamcast/dev/g2/gapspci_dma.c | 6 ++--
sys/arch/emips/emips/machdep.c | 6 ++--
sys/arch/evbarm/ifpga/ifpga.c | 10 ++++----
sys/arch/evbarm/tsarm/isa/isa_io.c | 8 +++---
sys/arch/evbmips/gdium/mainbus.c | 8 +++---
sys/arch/evbmips/rmixl/machdep.c | 6 ++--
sys/arch/evbppc/mpc85xx/machdep.c | 6 ++--
sys/arch/ews4800mips/ews4800mips/bus_space.c | 6 ++--
sys/arch/hp300/hp300/autoconf.c | 6 ++--
sys/arch/hp700/dev/astro.c | 4 +-
sys/arch/hp700/dev/dino.c | 6 ++--
sys/arch/hp700/dev/elroy.c | 4 +-
sys/arch/hp700/hp700/machdep.c | 6 ++--
sys/arch/hpcmips/hpcmips/bus_space.c | 6 ++--
sys/arch/hpcmips/tx/tx3912video.c | 6 ++--
sys/arch/hpcsh/hpcsh/bus_space.c | 6 ++--
sys/arch/ibmnws/ibmnws/mainbus.c | 6 ++--
sys/arch/mac68k/mac68k/machdep.c | 6 ++--
sys/arch/mips/alchemy/au_himem_space.c | 6 ++--
sys/arch/mips/alchemy/au_wired_space.c | 6 ++--
sys/arch/mips/alchemy/dev/aupci.c | 8 +++---
sys/arch/mips/mips/bus_space_alignstride_chipdep.c | 6 ++--
sys/arch/mips/rmi/rmixl_pcie.c | 8 +++---
sys/arch/mipsco/mipsco/bus_space.c | 6 ++--
sys/arch/mvmeppc/mvmeppc/mainbus.c | 8 +++---
sys/arch/ofppc/pci/ofwpci.c | 8 +++---
sys/arch/powerpc/booke/pci/pq3pci.c | 8 +++---
sys/arch/powerpc/ibm4xx/pci/pchb.c | 8 +++---
sys/arch/powerpc/powerpc/bus_space.c | 6 ++--
sys/arch/prep/prep/mainbus.c | 8 +++---
sys/arch/sandpoint/sandpoint/mainbus.c | 8 +++---
sys/arch/sgimips/gio/pci_gio.c | 6 ++--
sys/arch/sgimips/mace/pci_mace.c | 8 +++---
sys/arch/sh3/dev/shpcic.c | 8 +++---
sys/arch/sparc/dev/vme_machdep.c | 6 ++--
sys/arch/sparc/sparc/iommu.c | 6 ++--
sys/arch/sparc/sparc/machdep.c | 6 ++--
sys/arch/sparc64/dev/iommu.c | 6 ++--
sys/arch/sparc64/dev/psycho.c | 7 ++---
sys/arch/sparc64/sparc64/machdep.c | 6 ++--
sys/arch/sun2/sun2/machdep.c | 6 ++--
sys/arch/sun3/sun3/dvma.c | 6 ++--
sys/arch/sun3/sun3x/dvma.c | 6 ++--
sys/arch/vax/vax/machdep.c | 6 ++--
sys/arch/vax/vax/sgmap.c | 6 ++--
sys/arch/x68k/dev/intio.c | 6 ++--
sys/arch/x86/pci/pci_addr_fixup.c | 8 +++---
sys/arch/x86/x86/bus_space.c | 8 +++---
sys/dev/cardbus/rbus.c | 8 +++---
sys/dev/ic/cpc700.c | 8 +++---
sys/dev/marvell/gtpci.c | 10 +++-----
sys/dev/marvell/mvpex.c | 10 +++-----
sys/dev/pci/btvmei.c | 10 ++++----
sys/dev/pci/pciconf.c | 9 +++----
sys/dev/usb/usb_mem.c | 7 ++---
sys/dev/vme/vme.c | 13 ++++-------
sys/kern/subr_extent.c | 23 ++++++++++-----------
sys/sys/extent.h | 9 ++-----
tests/kernel/t_extent.c | 6 ++--
80 files changed, 288 insertions(+), 303 deletions(-)
diffs (truncated from 2412 to 300 lines):
diff -r 60934114a932 -r 9d906ab1fc4a sys/arch/algor/dev/mainbus.c
--- a/sys/arch/algor/dev/mainbus.c Fri Jan 27 16:41:22 2012 +0000
+++ b/sys/arch/algor/dev/mainbus.c Fri Jan 27 18:52:47 2012 +0000
@@ -1,4 +1,4 @@
-/* $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.
@@ -30,7 +30,7 @@
*/
#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"
@@ -159,9 +159,9 @@
* Reserve the bottom 64K of the I/O space for ISA devices.
*/
ioext = extent_create("pciio", 0x00010000, 0x000effff,
- M_DEVBUF, NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_NOWAIT);
memext = extent_create("pcimem", 0x01000000, 0x07ffffff,
- M_DEVBUF, NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_NOWAIT);
pc = &p4032_configuration.ac_pc;
#elif defined(ALGOR_P5064)
@@ -171,9 +171,9 @@
* a bug in the ISA bridge.
*/
ioext = extent_create("pciio", 0x00080000, 0x00ffffff,
- M_DEVBUF, NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_NOWAIT);
memext = extent_create("pcimem", 0x01000000, 0x07ffffff,
- M_DEVBUF, NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_NOWAIT);
pc = &p5064_configuration.ac_pc;
#if defined(PCI_NETBSD_ENABLE_IDE)
@@ -184,9 +184,9 @@
* Reserve the bottom 64K of the I/O space for ISA devices.
*/
ioext = extent_create("pciio", 0x00010000, 0x000effff,
- M_DEVBUF, NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_NOWAIT);
memext = extent_create("pcimem", 0x01000000, 0x0affffff,
- M_DEVBUF, NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_NOWAIT);
pc = &p6032_configuration.ac_pc;
#if defined(PCI_NETBSD_ENABLE_IDE)
diff -r 60934114a932 -r 9d906ab1fc4a sys/arch/alpha/common/sgmap_common.c
--- a/sys/arch/alpha/common/sgmap_common.c Fri Jan 27 16:41:22 2012 +0000
+++ b/sys/arch/alpha/common/sgmap_common.c Fri Jan 27 18:52:47 2012 +0000
@@ -1,4 +1,4 @@
-/* $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.
@@ -32,7 +32,7 @@
#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>
@@ -107,7 +107,7 @@
* space.
*/
sgmap->aps_ex = extent_create(name, sgvabase, sgvasize - 1,
- M_DMAMAP, NULL, 0, EX_NOWAIT|EX_NOCOALESCE);
+ NULL, 0, EX_NOWAIT|EX_NOCOALESCE);
if (sgmap->aps_ex == NULL) {
printf("unable to create extent map for sgmap `%s'\n",
name);
diff -r 60934114a932 -r 9d906ab1fc4a sys/arch/alpha/pci/pci_bwx_bus_io_chipdep.c
--- a/sys/arch/alpha/pci/pci_bwx_bus_io_chipdep.c Fri Jan 27 16:41:22 2012 +0000
+++ b/sys/arch/alpha/pci/pci_bwx_bus_io_chipdep.c Fri Jan 27 18:52:47 2012 +0000
@@ -1,4 +1,4 @@
-/* $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.
@@ -76,7 +76,7 @@
*/
#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>
@@ -302,7 +302,7 @@
t->abs_c_8 = __C(CHIP,_io_copy_region_8);
ex = extent_create(__S(__C(CHIP,_bus_io)), 0x0UL, 0xffffffffUL,
- M_DEVBUF, (void *)CHIP_IO_EX_STORE(v), CHIP_IO_EX_STORE_SIZE(v),
+ (void *)CHIP_IO_EX_STORE(v), CHIP_IO_EX_STORE_SIZE(v),
EX_NOWAIT|EX_NOCOALESCE);
CHIP_IO_EXTENT(v) = ex;
diff -r 60934114a932 -r 9d906ab1fc4a sys/arch/alpha/pci/pci_bwx_bus_mem_chipdep.c
--- a/sys/arch/alpha/pci/pci_bwx_bus_mem_chipdep.c Fri Jan 27 16:41:22 2012 +0000
+++ b/sys/arch/alpha/pci/pci_bwx_bus_mem_chipdep.c Fri Jan 27 18:52:47 2012 +0000
@@ -1,4 +1,4 @@
-/* $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.
@@ -76,7 +76,7 @@
*/
#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>
@@ -302,7 +302,7 @@
t->abs_c_8 = __C(CHIP,_mem_copy_region_8);
ex = extent_create(__S(__C(CHIP,_bus_mem)), 0x0UL, 0xffffffffUL,
- M_DEVBUF, (void *)CHIP_MEM_EX_STORE(v), CHIP_MEM_EX_STORE_SIZE(v),
+ (void *)CHIP_MEM_EX_STORE(v), CHIP_MEM_EX_STORE_SIZE(v),
EX_NOWAIT|EX_NOCOALESCE);
CHIP_MEM_EXTENT(v) = ex;
diff -r 60934114a932 -r 9d906ab1fc4a sys/arch/alpha/pci/pci_swiz_bus_io_chipdep.c
--- a/sys/arch/alpha/pci/pci_swiz_bus_io_chipdep.c Fri Jan 27 16:41:22 2012 +0000
+++ b/sys/arch/alpha/pci/pci_swiz_bus_io_chipdep.c Fri Jan 27 18:52:47 2012 +0000
@@ -1,4 +1,4 @@
-/* $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.
@@ -76,7 +76,7 @@
*/
#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>
@@ -307,7 +307,7 @@
/* XXX WE WANT EXTENT_NOCOALESCE, BUT WE CAN'T USE IT. XXX */
ex = extent_create(__S(__C(CHIP,_bus_io)), 0x0UL, 0xffffffffUL,
- M_DEVBUF, (void *)CHIP_IO_EX_STORE(v), CHIP_IO_EX_STORE_SIZE(v),
+ (void *)CHIP_IO_EX_STORE(v), CHIP_IO_EX_STORE_SIZE(v),
EX_NOWAIT);
extent_alloc_region(ex, 0, 0xffffffffUL, EX_NOWAIT);
diff -r 60934114a932 -r 9d906ab1fc4a sys/arch/alpha/pci/pci_swiz_bus_mem_chipdep.c
--- a/sys/arch/alpha/pci/pci_swiz_bus_mem_chipdep.c Fri Jan 27 16:41:22 2012 +0000
+++ b/sys/arch/alpha/pci/pci_swiz_bus_mem_chipdep.c Fri Jan 27 18:52:47 2012 +0000
@@ -1,4 +1,4 @@
-/* $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.
@@ -85,7 +85,7 @@
*/
#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>
@@ -329,7 +329,7 @@
#ifdef CHIP_D_MEM_W1_SYS_START
/* XXX WE WANT EXTENT_NOCOALESCE, BUT WE CAN'T USE IT. XXX */
dex = extent_create(__S(__C(CHIP,_bus_dmem)), 0x0UL,
- 0xffffffffffffffffUL, M_DEVBUF,
+ 0xffffffffffffffffUL,
(void *)CHIP_D_MEM_EX_STORE(v), CHIP_D_MEM_EX_STORE_SIZE(v),
EX_NOWAIT);
extent_alloc_region(dex, 0, 0xffffffffffffffffUL, EX_NOWAIT);
@@ -352,7 +352,7 @@
/* XXX WE WANT EXTENT_NOCOALESCE, BUT WE CAN'T USE IT. XXX */
sex = extent_create(__S(__C(CHIP,_bus_smem)), 0x0UL,
- 0xffffffffffffffffUL, M_DEVBUF,
+ 0xffffffffffffffffUL,
(void *)CHIP_S_MEM_EX_STORE(v), CHIP_S_MEM_EX_STORE_SIZE(v),
EX_NOWAIT);
extent_alloc_region(sex, 0, 0xffffffffffffffffUL, EX_NOWAIT);
diff -r 60934114a932 -r 9d906ab1fc4a sys/arch/arc/arc/bus_space.c
--- a/sys/arch/arc/arc/bus_space.c Fri Jan 27 16:41:22 2012 +0000
+++ b/sys/arch/arc/arc/bus_space.c Fri Jan 27 18:52:47 2012 +0000
@@ -1,4 +1,4 @@
-/* $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 */
/*-
@@ -32,7 +32,7 @@
*/
#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>
@@ -343,7 +343,7 @@
{
bst->bs_extent = extent_create(bst->bs_name,
- bst->bs_start, bst->bs_start + bst->bs_size, M_DEVBUF,
+ bst->bs_start, bst->bs_start + bst->bs_size,
storage, storagesize, EX_NOWAIT);
if (bst->bs_extent == NULL)
panic("arc_bus_space_init_extent: cannot create extent map %s",
diff -r 60934114a932 -r 9d906ab1fc4a sys/arch/arc/arc/wired_map_machdep.c
--- a/sys/arch/arc/arc/wired_map_machdep.c Fri Jan 27 16:41:22 2012 +0000
+++ b/sys/arch/arc/arc/wired_map_machdep.c Fri Jan 27 18:52:47 2012 +0000
@@ -1,4 +1,4 @@
-/* $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.
@@ -27,7 +27,7 @@
*/
#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>
@@ -55,7 +55,7 @@
mips3_nwired_page = 0;
arc_wired_map_ex = extent_create("wired_map",
- VM_MIN_WIRED_MAP_ADDRESS, VM_MAX_WIRED_MAP_ADDRESS, M_DEVBUF,
+ VM_MIN_WIRED_MAP_ADDRESS, VM_MAX_WIRED_MAP_ADDRESS,
(void *)wired_map_ex_storage, sizeof(wired_map_ex_storage),
EX_NOWAIT);
if (arc_wired_map_ex == NULL)
diff -r 60934114a932 -r 9d906ab1fc4a sys/arch/arc/jazz/jazzdmatlb.c
--- a/sys/arch/arc/jazz/jazzdmatlb.c Fri Jan 27 16:41:22 2012 +0000
+++ b/sys/arch/arc/jazz/jazzdmatlb.c Fri Jan 27 18:52:47 2012 +0000
@@ -1,4 +1,4 @@
-/* $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 $ */
/*-
@@ -33,7 +33,7 @@
*/
#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>
@@ -85,8 +85,7 @@
mips_dcache_wbinv_all();/* Make sure no map entries are cached */
memset((char *)dma_tlb, 0, JAZZ_DMATLB_SIZE);
- dmatlbmap = extent_create("dmatlb", 0, NDMATLB, M_DEVBUF, NULL, 0,
- EX_NOWAIT);
+ dmatlbmap = extent_create("dmatlb", 0, NDMATLB, NULL, 0, EX_NOWAIT);
if (dmatlbmap == NULL)
panic("jazz_dmatlb_init: cannot create extent map");
diff -r 60934114a932 -r 9d906ab1fc4a sys/arch/arc/pci/necpb.c
--- a/sys/arch/arc/pci/necpb.c Fri Jan 27 16:41:22 2012 +0000
+++ b/sys/arch/arc/pci/necpb.c Fri Jan 27 18:52:47 2012 +0000
@@ -1,4 +1,4 @@
-/* $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.
@@ -61,7 +61,7 @@
*/
#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"
@@ -243,9 +243,9 @@
pc = &sc->sc_ncp->nc_pc;
Home |
Main Index |
Thread Index |
Old Index