Back out M_* changes, per decision of the TRB.

Approved by: trb

11 files changed, 16 insertions, 16 deletions

diff --git a/sys/sparc64/ebus/ebus.c b/sys/sparc64/ebus/ebus.c
index 7147060..42d78c8 100644
--- a/sys/sparc64/ebus/ebus.c
+++ b/sys/sparc64/ebus/ebus.c
@@ -371,7 +371,7 @@ ebus_setup_dinfo(struct ebus_softc *sc, phandle_t node, char *name)
 	u_int64_t start;
 	int nreg, nintr, i;
 
-	edi = malloc(sizeof(*edi), M_DEVBUF, M_ZERO);
+	edi = malloc(sizeof(*edi), M_DEVBUF, M_ZERO | M_WAITOK);
 	if (edi == NULL)
 		return (NULL);
 	resource_list_init(&edi->edi_rl);
diff --git a/sys/sparc64/pci/ofw_pci.c b/sys/sparc64/pci/ofw_pci.c
index 3875a29..3787a00 100644
--- a/sys/sparc64/pci/ofw_pci.c
+++ b/sys/sparc64/pci/ofw_pci.c
@@ -94,7 +94,7 @@ ofw_pci_orb_callback(phandle_t node, u_int8_t *pintptr, int pintsz,
 		bcopy(pregptr, &preg, sizeof(preg));
 		intr = (OFW_PCI_PHYS_HI_DEVICE(preg.phys_hi) + pintr + 3) %
 		    4 + 1;
-		*rintr = malloc(sizeof(intr), M_OFWPROP, 0);
+		*rintr = malloc(sizeof(intr), M_OFWPROP, M_WAITOK);
 		bcopy(&intr, *rintr, sizeof(intr));
 		*terminate = 0;
 		return (sizeof(intr));
@@ -134,7 +134,7 @@ ofw_pci_alloc_busno(phandle_t node)
 		om = pci_bus_map;
 		pci_bus_map_sz = n + PCI_BUS_MAP_INC;
 		pci_bus_map = malloc(sizeof(*pci_bus_map) * pci_bus_map_sz,
-		    M_DEVBUF, M_ZERO);
+		    M_DEVBUF, M_WAITOK | M_ZERO);
 		if (om != NULL) {
 			bcopy(om, pci_bus_map, sizeof(*om) * osz);
 			free(om, M_DEVBUF);
diff --git a/sys/sparc64/pci/psycho.c b/sys/sparc64/pci/psycho.c
index 6413fd3..9fd83e2 100644
--- a/sys/sparc64/pci/psycho.c
+++ b/sys/sparc64/pci/psycho.c
@@ -617,7 +617,7 @@ psycho_attach(device_t dev)
 		 */
 		if (INTVEC(mr) != 0x7e6 && INTVEC(mr) != 0x7e7 &&
 		    INTVEC(mr) != 0) {
-			sclr = malloc(sizeof(*sclr), M_DEVBUF, 0);
+			sclr = malloc(sizeof(*sclr), M_DEVBUF, M_WAITOK);
 			sclr->psc_sc = sc;
 			sclr->psc_clr = clr;
 			intr_setup(PIL_LOW, intr_fast, INTVEC(mr),
diff --git a/sys/sparc64/sbus/sbus.c b/sys/sparc64/sbus/sbus.c
index 9df93a7..4664829 100644
--- a/sys/sparc64/sbus/sbus.c
+++ b/sys/sparc64/sbus/sbus.c
@@ -486,7 +486,7 @@ sbus_setup_dinfo(struct sbus_softc *sc, phandle_t node, char *name)
 	u_int32_t base, iv, *intr;
 	int i, nreg, nintr, slot, rslot;
 
-	sdi = malloc(sizeof(*sdi), M_DEVBUF, M_ZERO);
+	sdi = malloc(sizeof(*sdi), M_DEVBUF, M_ZERO | M_WAITOK);
 	if (sdi == NULL)
 		return (NULL);
 	resource_list_init(&sdi->sdi_rl);
diff --git a/sys/sparc64/sparc64/bus_machdep.c b/sys/sparc64/sparc64/bus_machdep.c
index 0c26023..71e1d0b 100644
--- a/sys/sparc64/sparc64/bus_machdep.c
+++ b/sys/sparc64/sparc64/bus_machdep.c
@@ -623,7 +623,7 @@ nexus_dmamem_alloc_size(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, void **vaddr,
 
 	if ((size <= PAGE_SIZE)) {
 		*vaddr = malloc(size, M_DEVBUF,
-		    (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : 0);
+		    (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK);
 	} else {
 		/*
 		 * XXX: Use contigmalloc until it is merged into this facility
@@ -631,7 +631,7 @@ nexus_dmamem_alloc_size(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, void **vaddr,
 		 * allocations yet though.
 		 */
 		*vaddr = contigmalloc(size, M_DEVBUF,
-		    (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : 0,
+		    (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK,
 		    0ul, ddmat->dt_lowaddr,
 		    ddmat->dt_alignment ? ddmat->dt_alignment : 1UL,
 		    ddmat->dt_boundary);
diff --git a/sys/sparc64/sparc64/counter.c b/sys/sparc64/sparc64/counter.c
index d90b89f..19bffef 100644
--- a/sys/sparc64/sparc64/counter.c
+++ b/sys/sparc64/sparc64/counter.c
@@ -83,8 +83,8 @@ sparc64_counter_init(bus_space_tag_t tag, bus_space_handle_t handle,
 	bus_space_write_8(tag, handle, offset + CTR_CT1 + CTR_LIMIT,
 	    COUNTER_MASK);
 	/* Register as a time counter. */
-	tc = malloc(sizeof(*tc), M_DEVBUF, 0);
-	sc = malloc(sizeof(*sc), M_DEVBUF, 0);
+	tc = malloc(sizeof(*tc), M_DEVBUF, M_WAITOK);
+	sc = malloc(sizeof(*sc), M_DEVBUF, M_WAITOK);
 	sc->sc_tag = tag;
 	sc->sc_handle = handle;
 	sc->sc_offset = offset + CTR_CT0;
diff --git a/sys/sparc64/sparc64/iommu.c b/sys/sparc64/sparc64/iommu.c
index 6332ca9..6059460 100644
--- a/sys/sparc64/sparc64/iommu.c
+++ b/sys/sparc64/sparc64/iommu.c
@@ -684,7 +684,7 @@ iommu_dvmamem_alloc_size(bus_dma_tag_t pt, bus_dma_tag_t dt,
 	if ((error = sparc64_dmamem_alloc_map(dt, mapp)) != 0)
 		return (error);
 	if ((*vaddr = malloc(size, M_IOMMU,
-	    (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : 0)) == NULL) {
+	    (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK)) == NULL) {
 		error = ENOMEM;
 		sparc64_dmamem_free_map(dt, *mapp);
 		return (error);
diff --git a/sys/sparc64/sparc64/mem.c b/sys/sparc64/sparc64/mem.c
index 1edb50e..cb20e6a 100644
--- a/sys/sparc64/sparc64/mem.c
+++ b/sys/sparc64/sparc64/mem.c
@@ -150,7 +150,7 @@ mmrw(dev_t dev, struct uio *uio, int flags)
 		case 0:
 			/* mem (physical memory) */
 			if (buf == NULL) {
-				buf = malloc(PAGE_SIZE, M_DEVBUF, 0);
+				buf = malloc(PAGE_SIZE, M_DEVBUF, M_WAITOK);
 				if (buf == NULL) {
 					error = ENOMEM;
 					break;
diff --git a/sys/sparc64/sparc64/nexus.c b/sys/sparc64/sparc64/nexus.c
index 0a1ee91..cf70ced 100644
--- a/sys/sparc64/sparc64/nexus.c
+++ b/sys/sparc64/sparc64/nexus.c
@@ -234,7 +234,7 @@ nexus_probe(device_t dev)
 		}
 		cdev = device_add_child(dev, NULL, -1);
 		if (cdev != NULL) {
-			dinfo = malloc(sizeof(*dinfo), M_NEXUS, 0);
+			dinfo = malloc(sizeof(*dinfo), M_NEXUS, M_WAITOK);
 			dinfo->ndi_node = child;
 			dinfo->ndi_name = name;
 			dinfo->ndi_device_type = type;
diff --git a/sys/sparc64/sparc64/ofw_bus.c b/sys/sparc64/sparc64/ofw_bus.c
index 3d5736e..605a347 100644
--- a/sys/sparc64/sparc64/ofw_bus.c
+++ b/sys/sparc64/sparc64/ofw_bus.c
@@ -108,7 +108,7 @@ ofw_bus_find_intr(u_int8_t *intr, int intrsz, u_int8_t *regs, int physsz,
 	int i, rsz, tsz;
 
 	rsz = -1;
-	ref = malloc(physsz + intrsz, M_TEMP, 0);
+	ref = malloc(physsz + intrsz, M_TEMP, M_WAITOK);
 	if (imapmsk != NULL) {
 		for (i = 0; i < physsz; i++)
 			ref[i] = regs[i] & imapmsk[i];
@@ -131,7 +131,7 @@ ofw_bus_find_intr(u_int8_t *intr, int intrsz, u_int8_t *regs, int physsz,
 		KASSERT(i >= physsz + intrsz + sizeof(parent) +
 		    pintrsz, ("ofw_bus_find_intr: truncated map"));
 		if (bcmp(ref, mptr, physsz + intrsz) == 0) {
-			*result = malloc(pintrsz, M_OFWPROP, 0);
+			*result = malloc(pintrsz, M_OFWPROP, M_WAITOK);
 			bcopy(mptr + physsz + intrsz + sizeof(parent),
 			    *result, pintrsz);
 			rsz = pintrsz;
@@ -177,7 +177,7 @@ ofw_bus_route_intr(phandle_t node, int intrp, obr_callback_t *cb)
 	} else {
 		ic = intrp;
 		isz = sizeof(ic);
-		intr = malloc(isz, M_OFWPROP, 0);
+		intr = malloc(isz, M_OFWPROP, M_WAITOK);
 		bcopy(&ic, intr, isz);
 	}
 	/*
diff --git a/sys/sparc64/sparc64/sys_machdep.c b/sys/sparc64/sparc64/sys_machdep.c
index 4a0b51e..34be95a 100644
--- a/sys/sparc64/sparc64/sys_machdep.c
+++ b/sys/sparc64/sparc64/sys_machdep.c
@@ -117,7 +117,7 @@ sparc_utrap_install(struct thread *td, char *args)
 		if (ua.type != UTH_NOCHANGE) {
 			if (ut == NULL) {
 				ut = malloc(sizeof *ut, M_SUBPROC,
-				    M_ZERO);
+				    M_WAITOK | M_ZERO);
 				ut->ut_refcnt = 1;
 				td->td_proc->p_md.md_utrap = ut;
 			}