Re: remove mapstore

2012-09-21 Thread Tobias Ulmer 
ping?

Re: remove mapstore

2012-09-21 Thread Mark Kettenis 
 Date: Fri, 21 Sep 2012 17:01:21 +0200
 From: Tobias Ulmer tobi...@tmux.org
 
 ping?

The diff looks good to me, but I haven't had the oppurtunity to test
it yet.

Re: remove mapstore

2012-09-11 Thread Tobias Ulmer 
On Sun, Sep 09, 2012 at 01:52:56AM +0200, Tobias Ulmer wrote:
 mapstore looks like an old error handling artifact. No binary change on
 amd64.

Btw, i've been testing this on armish, i386, landisk, socppc, sgi,
sparc, and hppa as part of another diff i'm cooking. This is really just
a noop ;-)

remove mapstore

2012-09-08 Thread Tobias Ulmer 
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 -  1.31
+++ alpha/dev/bus_dma.c 8 Sep 2012 23:32:56 -
@@ -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 -   1.38
+++ amd64/amd64/bus_dma.c   8 Sep 2012 23:32:58 -
@@ -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 -  1.21
+++ arm/arm/bus_dma.c   8 Sep 2012 23:33:00 -
@@ -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 -   1.5
+++ aviion/aviion/bus_dma.c 8 Sep 2012 23:33:03 -
@@ -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 -  1.25
+++ i386/i386/bus_dma.c 8 Sep 2012 23:33:20 -
@@ -90,7 +90,6 @@ _bus_dmamap_create(bus_dma_tag_t t, bus_