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

Approved by: trb

9 files changed, 24 insertions, 24 deletions

diff --git a/sys/amd64/amd64/amd64_mem.c b/sys/amd64/amd64/amd64_mem.c
index f3fc4e8..589fc64 100644
--- a/sys/amd64/amd64/amd64_mem.c
+++ b/sys/amd64/amd64/amd64_mem.c
@@ -557,7 +557,7 @@ i686_mrinit(struct mem_range_softc *sc)
 
     sc->mr_desc = 
 	(struct mem_range_desc *)malloc(nmdesc * sizeof(struct mem_range_desc), 
-					M_MEMDESC, M_ZERO);
+					M_MEMDESC, M_WAITOK | M_ZERO);
     sc->mr_ndesc = nmdesc;
 
     mrd = sc->mr_desc;
diff --git a/sys/amd64/amd64/bios.c b/sys/amd64/amd64/bios.c
index ae14099..747a3a1 100644
--- a/sys/amd64/amd64/bios.c
+++ b/sys/amd64/amd64/bios.c
@@ -388,7 +388,7 @@ bios16(struct bios_args *args, char *fmt, ...)
 	/*
 	 * no page table, so create one and install it.
 	 */
-	pte = (pt_entry_t *)malloc(PAGE_SIZE, M_TEMP, 0);
+	pte = (pt_entry_t *)malloc(PAGE_SIZE, M_TEMP, M_WAITOK);
 	ptd = (pd_entry_t *)((u_int)ptd + KERNBASE);
 	*ptd = vtophys(pte) | PG_RW | PG_V;
     } else {
diff --git a/sys/amd64/amd64/busdma_machdep.c b/sys/amd64/amd64/busdma_machdep.c
index a5a20fc..8f5898f 100644
--- a/sys/amd64/amd64/busdma_machdep.c
+++ b/sys/amd64/amd64/busdma_machdep.c
@@ -341,7 +341,7 @@ bus_dmamem_alloc_size(bus_dma_tag_t dmat, void** vaddr, int flags,
 
 	if ((size <= PAGE_SIZE) && dmat->lowaddr >= ptoa(Maxmem)) {
 		*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
@@ -349,7 +349,7 @@ bus_dmamem_alloc_size(bus_dma_tag_t dmat, void** vaddr, int flags,
 		 *     multi-seg allocations yet though.
 		 */
 		*vaddr = contigmalloc(size, M_DEVBUF,
-		    (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : 0,
+		    (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK,
 		    0ul, dmat->lowaddr, dmat->alignment? dmat->alignment : 1ul,
 		    dmat->boundary);
 	}
diff --git a/sys/amd64/amd64/mem.c b/sys/amd64/amd64/mem.c
index 4905d3c..41fa636 100644
--- a/sys/amd64/amd64/mem.c
+++ b/sys/amd64/amd64/mem.c
@@ -265,7 +265,7 @@ mmioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct thread *td)
 		if (nd > 0) {
 			md = (struct mem_range_desc *)
 				malloc(nd * sizeof(struct mem_range_desc),
-				       M_MEMDESC, 0);
+				       M_MEMDESC, M_WAITOK);
 			error = mem_range_attr_get(md, &nd);
 			if (!error)
 				error = copyout(md, mo->mo_desc, 
@@ -279,7 +279,7 @@ mmioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct thread *td)
 		
 	case MEMRANGE_SET:
 		md = (struct mem_range_desc *)malloc(sizeof(struct mem_range_desc),
-						    M_MEMDESC, 0);
+						    M_MEMDESC, M_WAITOK);
 		error = copyin(mo->mo_desc, md, sizeof(struct mem_range_desc));
 		/* clamp description string */
 		md->mr_owner[sizeof(md->mr_owner) - 1] = 0;
diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c
index cc29843..7ebd6ea 100644
--- a/sys/amd64/amd64/mp_machdep.c
+++ b/sys/amd64/amd64/mp_machdep.c
@@ -919,13 +919,13 @@ mptable_pass2(void)
 	pgeflag = 0;		/* XXX - Not used under SMP yet.  */
 
 	MALLOC(io_apic_versions, u_int32_t *, sizeof(u_int32_t) * mp_napics,
-	    M_DEVBUF, 0);
+	    M_DEVBUF, M_WAITOK);
 	MALLOC(ioapic, volatile ioapic_t **, sizeof(ioapic_t *) * mp_napics,
-	    M_DEVBUF, 0);
+	    M_DEVBUF, M_WAITOK);
 	MALLOC(io_apic_ints, io_int *, sizeof(io_int) * (nintrs + 1),
-	    M_DEVBUF, 0);
+	    M_DEVBUF, M_WAITOK);
 	MALLOC(bus_data, bus_datum *, sizeof(bus_datum) * mp_nbusses,
-	    M_DEVBUF, 0);
+	    M_DEVBUF, M_WAITOK);
 
 	bzero(ioapic, sizeof(ioapic_t *) * mp_napics);
 
diff --git a/sys/amd64/amd64/mptable.c b/sys/amd64/amd64/mptable.c
index cc29843..7ebd6ea 100644
--- a/sys/amd64/amd64/mptable.c
+++ b/sys/amd64/amd64/mptable.c
@@ -919,13 +919,13 @@ mptable_pass2(void)
 	pgeflag = 0;		/* XXX - Not used under SMP yet.  */
 
 	MALLOC(io_apic_versions, u_int32_t *, sizeof(u_int32_t) * mp_napics,
-	    M_DEVBUF, 0);
+	    M_DEVBUF, M_WAITOK);
 	MALLOC(ioapic, volatile ioapic_t **, sizeof(ioapic_t *) * mp_napics,
-	    M_DEVBUF, 0);
+	    M_DEVBUF, M_WAITOK);
 	MALLOC(io_apic_ints, io_int *, sizeof(io_int) * (nintrs + 1),
-	    M_DEVBUF, 0);
+	    M_DEVBUF, M_WAITOK);
 	MALLOC(bus_data, bus_datum *, sizeof(bus_datum) * mp_nbusses,
-	    M_DEVBUF, 0);
+	    M_DEVBUF, M_WAITOK);
 
 	bzero(ioapic, sizeof(ioapic_t *) * mp_napics);
 
diff --git a/sys/amd64/amd64/sys_machdep.c b/sys/amd64/amd64/sys_machdep.c
index bd89b74..5fcad03 100644
--- a/sys/amd64/amd64/sys_machdep.c
+++ b/sys/amd64/amd64/sys_machdep.c
@@ -298,7 +298,7 @@ user_ldt_alloc(struct mdproc *mdp, int len)
 		mtx_unlock_spin(&sched_lock);
 	mtx_assert(&sched_lock, MA_NOTOWNED);
 	MALLOC(new_ldt, struct proc_ldt *, sizeof(struct proc_ldt),
-		M_SUBPROC, 0);
+		M_SUBPROC, M_WAITOK);
 
 	new_ldt->ldt_len = len = NEW_MAX_LD(len);
 	new_ldt->ldt_base = (caddr_t)kmem_alloc(kernel_map,
diff --git a/sys/amd64/ia32/ia32_misc.c b/sys/amd64/ia32/ia32_misc.c
index d593c04..c6f26fe 100644
--- a/sys/amd64/ia32/ia32_misc.c
+++ b/sys/amd64/ia32/ia32_misc.c
@@ -105,7 +105,7 @@ ia32_emul_find(td, sgp, prefix, path, pbuf, cflag)
 	struct vattr		vat;
 	struct vattr		vatroot;
 
-	buf = (char *) malloc(MAXPATHLEN, M_TEMP, 0);
+	buf = (char *) malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
 	*pbuf = path;
 
 	for (ptr = buf; (*ptr = *prefix) != '\0'; ptr++, prefix++)
@@ -768,8 +768,8 @@ ia32_readv(struct thread *td, struct ia32_readv_args *uap)
 	osize = uap->iovcnt * sizeof (struct iovec32);
 	nsize = uap->iovcnt * sizeof (struct iovec);
 
-	oio = malloc(osize, M_TEMP, 0);
-	nio = malloc(nsize, M_TEMP, 0);
+	oio = malloc(osize, M_TEMP, M_WAITOK);
+	nio = malloc(nsize, M_TEMP, M_WAITOK);
 
 	error = 0;
 	if ((error = copyin(uap->iovp, oio, osize)))
@@ -814,8 +814,8 @@ ia32_writev(struct thread *td, struct ia32_writev_args *uap)
 	osize = uap->iovcnt * sizeof (struct iovec32);
 	nsize = uap->iovcnt * sizeof (struct iovec);
 
-	oio = malloc(osize, M_TEMP, 0);
-	nio = malloc(nsize, M_TEMP, 0);
+	oio = malloc(osize, M_TEMP, M_WAITOK);
+	nio = malloc(nsize, M_TEMP, M_WAITOK);
 
 	error = 0;
 	if ((error = copyin(uap->iovp, oio, osize)))
diff --git a/sys/amd64/include/mptable.h b/sys/amd64/include/mptable.h
index cc29843..7ebd6ea 100644
--- a/sys/amd64/include/mptable.h
+++ b/sys/amd64/include/mptable.h
@@ -919,13 +919,13 @@ mptable_pass2(void)
 	pgeflag = 0;		/* XXX - Not used under SMP yet.  */
 
 	MALLOC(io_apic_versions, u_int32_t *, sizeof(u_int32_t) * mp_napics,
-	    M_DEVBUF, 0);
+	    M_DEVBUF, M_WAITOK);
 	MALLOC(ioapic, volatile ioapic_t **, sizeof(ioapic_t *) * mp_napics,
-	    M_DEVBUF, 0);
+	    M_DEVBUF, M_WAITOK);
 	MALLOC(io_apic_ints, io_int *, sizeof(io_int) * (nintrs + 1),
-	    M_DEVBUF, 0);
+	    M_DEVBUF, M_WAITOK);
 	MALLOC(bus_data, bus_datum *, sizeof(bus_datum) * mp_nbusses,
-	    M_DEVBUF, 0);
+	    M_DEVBUF, M_WAITOK);
 
 	bzero(ioapic, sizeof(ioapic_t *) * mp_napics);