mapstore looks like an old error handling artifact. No binary change on
amd64.
Index: alpha/dev/bus_dma.c
===================================================================
RCS file: /home/vcs/cvs/openbsd/src/sys/arch/alpha/dev/bus_dma.c,v
retrieving revision 1.31
diff -u -p -r1.31 bus_dma.c
--- alpha/dev/bus_dma.c 23 Jun 2011 20:44:38 -0000 1.31
+++ alpha/dev/bus_dma.c 8 Sep 2012 23:32:56 -0000
@@ -64,7 +64,6 @@ _bus_dmamap_create(t, size, nsegments, m
bus_dmamap_t *dmamp;
{
struct alpha_bus_dmamap *map;
- void *mapstore;
size_t mapsize;
/*
@@ -81,11 +80,10 @@ _bus_dmamap_create(t, size, nsegments, m
*/
mapsize = sizeof(struct alpha_bus_dmamap) +
(sizeof(bus_dma_segment_t) * (nsegments - 1));
- if ((mapstore = malloc(mapsize, M_DEVBUF, (flags & BUS_DMA_NOWAIT) ?
+ if ((map = malloc(mapsize, M_DEVBUF, (flags & BUS_DMA_NOWAIT) ?
(M_NOWAIT | M_ZERO) : (M_WAITOK | M_ZERO))) == NULL)
return (ENOMEM);
- map = (struct alpha_bus_dmamap *)mapstore;
map->_dm_size = size;
map->_dm_segcnt = nsegments;
map->_dm_maxsegsz = maxsegsz;
Index: amd64/amd64/bus_dma.c
===================================================================
RCS file: /home/vcs/cvs/openbsd/src/sys/arch/amd64/amd64/bus_dma.c,v
retrieving revision 1.38
diff -u -p -r1.38 bus_dma.c
--- amd64/amd64/bus_dma.c 3 Jul 2011 18:31:02 -0000 1.38
+++ amd64/amd64/bus_dma.c 8 Sep 2012 23:32:58 -0000
@@ -125,7 +125,6 @@ _bus_dmamap_create(bus_dma_tag_t t, bus_
bus_size_t maxsegsz, bus_size_t boundary, int flags, bus_dmamap_t *dmamp)
{
struct bus_dmamap *map;
- void *mapstore;
size_t mapsize;
/*
@@ -142,12 +141,11 @@ _bus_dmamap_create(bus_dma_tag_t t, bus_
*/
mapsize = sizeof(struct bus_dmamap) +
(sizeof(bus_dma_segment_t) * (nsegments - 1));
- if ((mapstore = malloc(mapsize, M_DEVBUF,
+ if ((map = malloc(mapsize, M_DEVBUF,
(flags & BUS_DMA_NOWAIT) ?
(M_NOWAIT|M_ZERO) : (M_WAITOK|M_ZERO))) == NULL)
return (ENOMEM);
- map = (struct bus_dmamap *)mapstore;
map->_dm_size = size;
map->_dm_segcnt = nsegments;
map->_dm_maxsegsz = maxsegsz;
Index: arm/arm/bus_dma.c
===================================================================
RCS file: /home/vcs/cvs/openbsd/src/sys/arch/arm/arm/bus_dma.c,v
retrieving revision 1.21
diff -u -p -r1.21 bus_dma.c
--- arm/arm/bus_dma.c 23 Jun 2011 20:44:39 -0000 1.21
+++ arm/arm/bus_dma.c 8 Sep 2012 23:33:00 -0000
@@ -86,7 +86,6 @@ _bus_dmamap_create(bus_dma_tag_t t, bus_
bus_size_t maxsegsz, bus_size_t boundary, int flags, bus_dmamap_t *dmamp)
{
struct arm32_bus_dmamap *map;
- void *mapstore;
size_t mapsize;
#ifdef DEBUG_DMA
@@ -108,11 +107,10 @@ _bus_dmamap_create(bus_dma_tag_t t, bus_
*/
mapsize = sizeof(struct arm32_bus_dmamap) +
(sizeof(bus_dma_segment_t) * (nsegments - 1));
- if ((mapstore = malloc(mapsize, M_DEVBUF, (flags & BUS_DMA_NOWAIT) ?
+ if ((map = malloc(mapsize, M_DEVBUF, (flags & BUS_DMA_NOWAIT) ?
(M_NOWAIT | M_ZERO) : (M_WAITOK | M_ZERO))) == NULL)
return (ENOMEM);
- map = (struct arm32_bus_dmamap *)mapstore;
map->_dm_size = size;
map->_dm_segcnt = nsegments;
map->_dm_maxsegsz = maxsegsz;
Index: aviion/aviion/bus_dma.c
===================================================================
RCS file: /home/vcs/cvs/openbsd/src/sys/arch/aviion/aviion/bus_dma.c,v
retrieving revision 1.5
diff -u -p -r1.5 bus_dma.c
--- aviion/aviion/bus_dma.c 9 Oct 2011 17:08:21 -0000 1.5
+++ aviion/aviion/bus_dma.c 8 Sep 2012 23:33:03 -0000
@@ -70,7 +70,6 @@ bus_dmamap_create(t, size, nsegments, ma
bus_dmamap_t *dmamp;
{
struct m88k_bus_dmamap *map;
- void *mapstore;
size_t mapsize;
/*
@@ -87,11 +86,10 @@ bus_dmamap_create(t, size, nsegments, ma
*/
mapsize = sizeof(struct m88k_bus_dmamap) +
(sizeof(bus_dma_segment_t) * (nsegments - 1));
- if ((mapstore = malloc(mapsize, M_DEVBUF, (flags & BUS_DMA_NOWAIT) ?
+ if ((map = malloc(mapsize, M_DEVBUF, (flags & BUS_DMA_NOWAIT) ?
(M_NOWAIT | M_ZERO) : (M_WAITOK | M_ZERO))) == NULL)
return (ENOMEM);
- map = (struct m88k_bus_dmamap *)mapstore;
map->_dm_size = size;
map->_dm_segcnt = nsegments;
map->_dm_maxsegsz = maxsegsz;
Index: i386/i386/bus_dma.c
===================================================================
RCS file: /home/vcs/cvs/openbsd/src/sys/arch/i386/i386/bus_dma.c,v
retrieving revision 1.25
diff -u -p -r1.25 bus_dma.c
--- i386/i386/bus_dma.c 23 Jun 2011 20:44:39 -0000 1.25
+++ i386/i386/bus_dma.c 8 Sep 2012 23:33:20 -0000
@@ -90,7 +90,6 @@ _bus_dmamap_create(bus_dma_tag_t t, bus_
bus_size_t maxsegsz, bus_size_t boundary, int flags, bus_dmamap_t *dmamp)
{
struct bus_dmamap *map;
- void *mapstore;
size_t mapsize;
/*
@@ -107,11 +106,10 @@ _bus_dmamap_create(bus_dma_tag_t t, bus_
*/
mapsize = sizeof(struct bus_dmamap) +
(sizeof(bus_dma_segment_t) * (nsegments - 1));
- if ((mapstore = malloc(mapsize, M_DEVBUF,
+ if ((map = malloc(mapsize, M_DEVBUF,
((flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK) | M_ZERO)) == NULL)
return (ENOMEM);
- map = (struct bus_dmamap *)mapstore;
map->_dm_size = size;
map->_dm_segcnt = nsegments;
map->_dm_maxsegsz = maxsegsz;
Index: landisk/landisk/bus_dma.c
===================================================================
RCS file: /home/vcs/cvs/openbsd/src/sys/arch/landisk/landisk/bus_dma.c,v
retrieving revision 1.9
diff -u -p -r1.9 bus_dma.c
--- landisk/landisk/bus_dma.c 21 Apr 2010 03:03:26 -0000 1.9
+++ landisk/landisk/bus_dma.c 8 Sep 2012 23:33:29 -0000
@@ -75,7 +75,6 @@ _bus_dmamap_create(bus_dma_tag_t t, bus_
bus_size_t maxsegsz, bus_size_t boundary, int flags, bus_dmamap_t *dmamp)
{
bus_dmamap_t map;
- void *mapstore;
size_t mapsize;
int error;
@@ -96,13 +95,12 @@ _bus_dmamap_create(bus_dma_tag_t t, bus_
error = 0;
mapsize = sizeof(struct _bus_dmamap) +
(sizeof(bus_dma_segment_t) * (nsegments - 1));
- if ((mapstore = malloc(mapsize, M_DEVBUF, (flags & BUS_DMA_NOWAIT) ?
+ if ((map = malloc(mapsize, M_DEVBUF, (flags & BUS_DMA_NOWAIT) ?
(M_NOWAIT | M_ZERO) : (M_WAITOK | M_ZERO))) == NULL)
return (ENOMEM);
- DPRINTF(("bus_dmamap_create: dmamp = %p\n", mapstore));
+ DPRINTF(("bus_dmamap_create: dmamp = %p\n", map));
- map = (bus_dmamap_t)mapstore;
map->_dm_size = size;
map->_dm_segcnt = nsegments;
map->_dm_maxsegsz = maxsegsz;
Index: loongson/loongson/bus_dma.c
===================================================================
RCS file: /home/vcs/cvs/openbsd/src/sys/arch/loongson/loongson/bus_dma.c,v
retrieving revision 1.10
diff -u -p -r1.10 bus_dma.c
--- loongson/loongson/bus_dma.c 21 Apr 2012 12:20:30 -0000 1.10
+++ loongson/loongson/bus_dma.c 8 Sep 2012 23:33:31 -0000
@@ -79,7 +79,6 @@ _dmamap_create(bus_dma_tag_t t, bus_size
bus_size_t maxsegsz, bus_size_t boundary, int flags, bus_dmamap_t *dmamp)
{
struct machine_bus_dmamap *map;
- void *mapstore;
size_t mapsize;
/*
@@ -96,11 +95,10 @@ _dmamap_create(bus_dma_tag_t t, bus_size
*/
mapsize = sizeof(struct machine_bus_dmamap) +
(sizeof(bus_dma_segment_t) * (nsegments - 1));
- if ((mapstore = malloc(mapsize, M_DEVBUF, (flags & BUS_DMA_NOWAIT) ?
+ if ((map = malloc(mapsize, M_DEVBUF, (flags & BUS_DMA_NOWAIT) ?
(M_NOWAIT | M_ZERO) : (M_WAITOK | M_ZERO))) == NULL)
return (ENOMEM);
- map = (struct machine_bus_dmamap *)mapstore;
map->_dm_size = size;
map->_dm_segcnt = nsegments;
map->_dm_maxsegsz = maxsegsz;
Index: macppc/macppc/dma.c
===================================================================
RCS file: /home/vcs/cvs/openbsd/src/sys/arch/macppc/macppc/dma.c,v
retrieving revision 1.36
diff -u -p -r1.36 dma.c
--- macppc/macppc/dma.c 30 Aug 2012 18:14:26 -0000 1.36
+++ macppc/macppc/dma.c 8 Sep 2012 23:33:52 -0000
@@ -61,7 +61,6 @@ _dmamap_create(bus_dma_tag_t t, bus_size
bus_size_t maxsegsz, bus_size_t boundary, int flags, bus_dmamap_t *dmamp)
{
struct powerpc_bus_dmamap *map;
- void *mapstore;
size_t mapsize;
/*
@@ -78,11 +77,10 @@ _dmamap_create(bus_dma_tag_t t, bus_size
*/
mapsize = sizeof(struct powerpc_bus_dmamap) +
(sizeof(bus_dma_segment_t) * (nsegments - 1));
- if ((mapstore = malloc(mapsize, M_DEVBUF, (flags & BUS_DMA_NOWAIT) ?
+ if ((map = malloc(mapsize, M_DEVBUF, (flags & BUS_DMA_NOWAIT) ?
(M_NOWAIT | M_ZERO) : (M_WAITOK | M_ZERO))) == NULL)
return (ENOMEM);
- map = (struct powerpc_bus_dmamap *)mapstore;
map->_dm_size = size;
map->_dm_segcnt = nsegments;
map->_dm_maxsegsz = maxsegsz;
Index: mvme68k/mvme68k/bus_dma.c
===================================================================
RCS file: /home/vcs/cvs/openbsd/src/sys/arch/mvme68k/mvme68k/bus_dma.c,v
retrieving revision 1.9
diff -u -p -r1.9 bus_dma.c
--- mvme68k/mvme68k/bus_dma.c 23 Jun 2011 20:44:39 -0000 1.9
+++ mvme68k/mvme68k/bus_dma.c 8 Sep 2012 23:33:59 -0000
@@ -71,7 +71,6 @@ bus_dmamap_create(t, size, nsegments, ma
bus_dmamap_t *dmamp;
{
struct m68k_bus_dmamap *map;
- void *mapstore;
size_t mapsize;
/*
@@ -88,11 +87,10 @@ bus_dmamap_create(t, size, nsegments, ma
*/
mapsize = sizeof(struct m68k_bus_dmamap) +
(sizeof(bus_dma_segment_t) * (nsegments - 1));
- if ((mapstore = malloc(mapsize, M_DEVBUF, (flags & BUS_DMA_NOWAIT) ?
+ if ((map = malloc(mapsize, M_DEVBUF, (flags & BUS_DMA_NOWAIT) ?
(M_NOWAIT | M_ZERO) : (M_WAITOK | M_ZERO))) == NULL)
return (ENOMEM);
- map = (struct m68k_bus_dmamap *)mapstore;
map->_dm_size = size;
map->_dm_segcnt = nsegments;
map->_dm_maxsegsz = maxsegsz;
Index: mvme88k/mvme88k/bus_dma.c
===================================================================
RCS file: /home/vcs/cvs/openbsd/src/sys/arch/mvme88k/mvme88k/bus_dma.c,v
retrieving revision 1.18
diff -u -p -r1.18 bus_dma.c
--- mvme88k/mvme88k/bus_dma.c 9 Oct 2011 17:08:22 -0000 1.18
+++ mvme88k/mvme88k/bus_dma.c 8 Sep 2012 23:34:03 -0000
@@ -70,7 +70,6 @@ bus_dmamap_create(t, size, nsegments, ma
bus_dmamap_t *dmamp;
{
struct m88k_bus_dmamap *map;
- void *mapstore;
size_t mapsize;
/*
@@ -87,11 +86,10 @@ bus_dmamap_create(t, size, nsegments, ma
*/
mapsize = sizeof(struct m88k_bus_dmamap) +
(sizeof(bus_dma_segment_t) * (nsegments - 1));
- if ((mapstore = malloc(mapsize, M_DEVBUF, (flags & BUS_DMA_NOWAIT) ?
+ if ((map = malloc(mapsize, M_DEVBUF, (flags & BUS_DMA_NOWAIT) ?
(M_NOWAIT | M_ZERO) : (M_WAITOK | M_ZERO))) == NULL)
return (ENOMEM);
- map = (struct m88k_bus_dmamap *)mapstore;
map->_dm_size = size;
map->_dm_segcnt = nsegments;
map->_dm_maxsegsz = maxsegsz;
Index: octeon/octeon/bus_dma.c
===================================================================
RCS file: /home/vcs/cvs/openbsd/src/sys/arch/octeon/octeon/bus_dma.c,v
retrieving revision 1.6
diff -u -p -r1.6 bus_dma.c
--- octeon/octeon/bus_dma.c 21 Apr 2012 12:20:30 -0000 1.6
+++ octeon/octeon/bus_dma.c 8 Sep 2012 23:34:07 -0000
@@ -79,7 +79,6 @@ _dmamap_create(bus_dma_tag_t t, bus_size
bus_size_t maxsegsz, bus_size_t boundary, int flags, bus_dmamap_t *dmamp)
{
struct machine_bus_dmamap *map;
- void *mapstore;
size_t mapsize;
/*
@@ -96,11 +95,10 @@ _dmamap_create(bus_dma_tag_t t, bus_size
*/
mapsize = sizeof(struct machine_bus_dmamap) +
(sizeof(bus_dma_segment_t) * (nsegments - 1));
- if ((mapstore = malloc(mapsize, M_DEVBUF, (flags & BUS_DMA_NOWAIT) ?
+ if ((map = malloc(mapsize, M_DEVBUF, (flags & BUS_DMA_NOWAIT) ?
(M_NOWAIT | M_ZERO) : (M_WAITOK | M_ZERO))) == NULL)
return (ENOMEM);
- map = (struct machine_bus_dmamap *)mapstore;
map->_dm_size = size;
map->_dm_segcnt = nsegments;
map->_dm_maxsegsz = maxsegsz;
Index: sgi/sgi/bus_dma.c
===================================================================
RCS file: /home/vcs/cvs/openbsd/src/sys/arch/sgi/sgi/bus_dma.c,v
retrieving revision 1.29
diff -u -p -r1.29 bus_dma.c
--- sgi/sgi/bus_dma.c 27 May 2012 14:27:10 -0000 1.29
+++ sgi/sgi/bus_dma.c 8 Sep 2012 23:34:12 -0000
@@ -83,7 +83,6 @@ _dmamap_create(bus_dma_tag_t t, bus_size
bus_size_t maxsegsz, bus_size_t boundary, int flags, bus_dmamap_t *dmamp)
{
struct machine_bus_dmamap *map;
- void *mapstore;
size_t mapsize;
/*
@@ -100,11 +99,10 @@ _dmamap_create(bus_dma_tag_t t, bus_size
*/
mapsize = sizeof(struct machine_bus_dmamap) +
(sizeof(bus_dma_segment_t) * (nsegments - 1));
- if ((mapstore = malloc(mapsize, M_DEVBUF, (flags & BUS_DMA_NOWAIT) ?
+ if ((map = malloc(mapsize, M_DEVBUF, (flags & BUS_DMA_NOWAIT) ?
(M_NOWAIT | M_ZERO) : (M_WAITOK | M_ZERO))) == NULL)
return (ENOMEM);
- map = (struct machine_bus_dmamap *)mapstore;
map->_dm_size = size;
map->_dm_segcnt = nsegments;
map->_dm_maxsegsz = maxsegsz;
Index: socppc/socppc/dma.c
===================================================================
RCS file: /home/vcs/cvs/openbsd/src/sys/arch/socppc/socppc/dma.c,v
retrieving revision 1.9
diff -u -p -r1.9 dma.c
--- socppc/socppc/dma.c 23 Jun 2011 20:44:39 -0000 1.9
+++ socppc/socppc/dma.c 8 Sep 2012 23:34:16 -0000
@@ -61,7 +61,6 @@ _dmamap_create(bus_dma_tag_t t, bus_size
bus_size_t maxsegsz, bus_size_t boundary, int flags, bus_dmamap_t *dmamp)
{
struct powerpc_bus_dmamap *map;
- void *mapstore;
size_t mapsize;
/*
@@ -78,11 +77,10 @@ _dmamap_create(bus_dma_tag_t t, bus_size
*/
mapsize = sizeof(struct powerpc_bus_dmamap) +
(sizeof(bus_dma_segment_t) * (nsegments - 1));
- if ((mapstore = malloc(mapsize, M_DEVBUF, (flags & BUS_DMA_NOWAIT) ?
+ if ((map = malloc(mapsize, M_DEVBUF, (flags & BUS_DMA_NOWAIT) ?
(M_NOWAIT | M_ZERO) : (M_WAITOK | M_ZERO))) == NULL)
return (ENOMEM);
- map = (struct powerpc_bus_dmamap *)mapstore;
map->_dm_size = size;
map->_dm_segcnt = nsegments;
map->_dm_maxsegsz = maxsegsz;
Index: sparc/sparc/machdep.c
===================================================================
RCS file: /home/vcs/cvs/openbsd/src/sys/arch/sparc/sparc/machdep.c,v
retrieving revision 1.140
diff -u -p -r1.140 machdep.c
--- sparc/sparc/machdep.c 22 Aug 2012 13:33:32 -0000 1.140
+++ sparc/sparc/machdep.c 8 Sep 2012 23:34:26 -0000
@@ -944,7 +944,6 @@ _bus_dmamap_create(bus_dma_tag_t t, bus_
bus_dmamap_t *dmamp)
{
struct sparc_bus_dmamap *map;
- void *mapstore;
size_t mapsize;
/*
@@ -961,11 +960,10 @@ _bus_dmamap_create(bus_dma_tag_t t, bus_
*/
mapsize = sizeof(struct sparc_bus_dmamap) +
(sizeof(bus_dma_segment_t) * (nsegments - 1));
- if ((mapstore = malloc(mapsize, M_DEVBUF, (flags & BUS_DMA_NOWAIT) ?
+ if ((map = malloc(mapsize, M_DEVBUF, (flags & BUS_DMA_NOWAIT) ?
(M_NOWAIT | M_ZERO) : (M_WAITOK | M_ZERO))) == NULL)
return (ENOMEM);
- map = (struct sparc_bus_dmamap *)mapstore;
map->_dm_size = size;
map->_dm_segcnt = nsegments;
map->_dm_maxmaxsegsz = maxsegsz;
Index: sparc64/sparc64/machdep.c
===================================================================
RCS file: /home/vcs/cvs/openbsd/src/sys/arch/sparc64/sparc64/machdep.c,v
retrieving revision 1.140
diff -u -p -r1.140 machdep.c
--- sparc64/sparc64/machdep.c 24 Aug 2012 10:00:55 -0000 1.140
+++ sparc64/sparc64/machdep.c 8 Sep 2012 23:34:34 -0000
@@ -966,7 +966,6 @@ _bus_dmamap_create(t, t0, size, nsegment
bus_dmamap_t *dmamp;
{
struct sparc_bus_dmamap *map;
- void *mapstore;
size_t mapsize;
/*
@@ -983,11 +982,10 @@ _bus_dmamap_create(t, t0, size, nsegment
*/
mapsize = sizeof(struct sparc_bus_dmamap) +
(sizeof(bus_dma_segment_t) * (nsegments - 1));
- if ((mapstore = malloc(mapsize, M_DEVBUF, (flags & BUS_DMA_NOWAIT) ?
+ if ((map = malloc(mapsize, M_DEVBUF, (flags & BUS_DMA_NOWAIT) ?
(M_NOWAIT | M_ZERO) : (M_WAITOK | M_ZERO))) == NULL)
return (ENOMEM);
- map = (struct sparc_bus_dmamap *)mapstore;
map->_dm_size = size;
map->_dm_segcnt = nsegments;
map->_dm_maxsegsz = maxsegsz;
Index: vax/vax/bus_dma.c
===================================================================
RCS file: /home/vcs/cvs/openbsd/src/sys/arch/vax/vax/bus_dma.c,v
retrieving revision 1.27
diff -u -p -r1.27 bus_dma.c
--- vax/vax/bus_dma.c 23 Jun 2011 20:44:39 -0000 1.27
+++ vax/vax/bus_dma.c 8 Sep 2012 23:34:39 -0000
@@ -78,7 +78,6 @@ _bus_dmamap_create(t, size, nsegments, m
bus_dmamap_t *dmamp;
{
struct vax_bus_dmamap *map;
- void *mapstore;
size_t mapsize;
#ifdef DEBUG_DMA
@@ -100,11 +99,10 @@ _bus_dmamap_create(t, size, nsegments, m
*/
mapsize = sizeof(struct vax_bus_dmamap) +
(sizeof(bus_dma_segment_t) * (nsegments - 1));
- if ((mapstore = malloc(mapsize, M_DEVBUF, (flags & BUS_DMA_NOWAIT) ?
+ if ((map = malloc(mapsize, M_DEVBUF, (flags & BUS_DMA_NOWAIT) ?
(M_NOWAIT | M_ZERO) : (M_WAITOK | M_ZERO))) == NULL)
return (ENOMEM);
- map = (struct vax_bus_dmamap *)mapstore;
map->_dm_size = size;
map->_dm_segcnt = nsegments;
map->_dm_maxsegsz = maxsegsz;
