diff options
author | alfred <alfred@FreeBSD.org> | 2003-01-21 08:56:16 +0000 |
---|---|---|
committer | alfred <alfred@FreeBSD.org> | 2003-01-21 08:56:16 +0000 |
commit | bf8e8a6e8f0bd9165109f0a258730dd242299815 (patch) | |
tree | f16a2fb9fa7a7fbc4c19e981d278d5f6eb53234d /sys/powerpc | |
parent | 2180deee00350fff613a1d1d1328eddc4c0ba9c8 (diff) | |
download | FreeBSD-src-bf8e8a6e8f0bd9165109f0a258730dd242299815.zip FreeBSD-src-bf8e8a6e8f0bd9165109f0a258730dd242299815.tar.gz |
Remove M_TRYWAIT/M_WAITOK/M_WAIT. Callers should use 0.
Merge M_NOWAIT/M_DONTWAIT into a single flag M_NOWAIT.
Diffstat (limited to 'sys/powerpc')
-rw-r--r-- | sys/powerpc/aim/nexus.c | 2 | ||||
-rw-r--r-- | sys/powerpc/powermac/macio.c | 2 | ||||
-rw-r--r-- | sys/powerpc/powerpc/busdma_machdep.c | 4 | ||||
-rw-r--r-- | sys/powerpc/powerpc/extintr.c | 2 | ||||
-rw-r--r-- | sys/powerpc/powerpc/nexus.c | 2 | ||||
-rw-r--r-- | sys/powerpc/psim/iobus.c | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/sys/powerpc/aim/nexus.c b/sys/powerpc/aim/nexus.c index 7472bbe..7172962 100644 --- a/sys/powerpc/aim/nexus.c +++ b/sys/powerpc/aim/nexus.c @@ -392,7 +392,7 @@ create_device_from_node(device_t parent, phandle_t node) OF_getprop_alloc(node, "compatible", 1, (void **)&compatible); cdev = device_add_child(parent, NULL, -1); if (cdev != NULL) { - dinfo = malloc(sizeof(*dinfo), M_NEXUS, M_WAITOK); + dinfo = malloc(sizeof(*dinfo), M_NEXUS, 0); dinfo->ndi_node = node; dinfo->ndi_name = name; dinfo->ndi_device_type = type; diff --git a/sys/powerpc/powermac/macio.c b/sys/powerpc/powermac/macio.c index a924dd47..6445602 100644 --- a/sys/powerpc/powermac/macio.c +++ b/sys/powerpc/powermac/macio.c @@ -287,7 +287,7 @@ macio_attach(device_t dev) cdev = device_add_child(dev, NULL, -1); if (cdev != NULL) { - dinfo = malloc(sizeof(*dinfo), M_MACIO, M_WAITOK); + dinfo = malloc(sizeof(*dinfo), M_MACIO, 0); memset(dinfo, 0, sizeof(*dinfo)); resource_list_init(&dinfo->mdi_resources); dinfo->mdi_node = child; diff --git a/sys/powerpc/powerpc/busdma_machdep.c b/sys/powerpc/powerpc/busdma_machdep.c index 1ad7e09..007137a 100644 --- a/sys/powerpc/powerpc/busdma_machdep.c +++ b/sys/powerpc/powerpc/busdma_machdep.c @@ -209,7 +209,7 @@ bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags, if (dmat->maxsize <= PAGE_SIZE) { *vaddr = malloc(dmat->maxsize, M_DEVBUF, - (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK); + (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : 0); } else { /* * XXX Use Contigmalloc until it is merged into this facility @@ -217,7 +217,7 @@ bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags, * multi-seg allocations yet though. */ *vaddr = contigmalloc(dmat->maxsize, M_DEVBUF, - (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK, + (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : 0, 0ul, dmat->lowaddr, dmat->alignment? dmat->alignment : 1ul, dmat->boundary); } diff --git a/sys/powerpc/powerpc/extintr.c b/sys/powerpc/powerpc/extintr.c index 48e893d..345c593 100644 --- a/sys/powerpc/powerpc/extintr.c +++ b/sys/powerpc/powerpc/extintr.c @@ -452,7 +452,7 @@ intr_establish(int irq, int type, int level, int (*ih_fun)(void *), irq = mapirq(irq); /* no point in sleeping unless someone can free memory. */ - ih = malloc(sizeof *ih, M_DEVBUF, cold ? M_NOWAIT : M_WAITOK); + ih = malloc(sizeof *ih, M_DEVBUF, cold ? M_NOWAIT : 0); if (ih == NULL) panic("intr_establish: can't malloc handler info"); diff --git a/sys/powerpc/powerpc/nexus.c b/sys/powerpc/powerpc/nexus.c index 7472bbe..7172962 100644 --- a/sys/powerpc/powerpc/nexus.c +++ b/sys/powerpc/powerpc/nexus.c @@ -392,7 +392,7 @@ create_device_from_node(device_t parent, phandle_t node) OF_getprop_alloc(node, "compatible", 1, (void **)&compatible); cdev = device_add_child(parent, NULL, -1); if (cdev != NULL) { - dinfo = malloc(sizeof(*dinfo), M_NEXUS, M_WAITOK); + dinfo = malloc(sizeof(*dinfo), M_NEXUS, 0); dinfo->ndi_node = node; dinfo->ndi_name = name; dinfo->ndi_device_type = type; diff --git a/sys/powerpc/psim/iobus.c b/sys/powerpc/psim/iobus.c index 3428125..21534b3 100644 --- a/sys/powerpc/psim/iobus.c +++ b/sys/powerpc/psim/iobus.c @@ -215,7 +215,7 @@ iobus_attach(device_t dev) cdev = device_add_child(dev, NULL, -1); if (cdev != NULL) { - dinfo = malloc(sizeof(*dinfo), M_IOBUS, M_WAITOK); + dinfo = malloc(sizeof(*dinfo), M_IOBUS, 0); memset(dinfo, 0, sizeof(*dinfo)); resource_list_init(&dinfo->id_resources); dinfo->id_node = child; |