Remove M_TRYWAIT/M_WAITOK/M_WAIT. Callers should use 0.

Merge M_NOWAIT/M_DONTWAIT into a single flag M_NOWAIT.

6 files changed, 13 insertions, 13 deletions

diff --git a/sys/ia64/ia32/ia32_misc.c b/sys/ia64/ia32/ia32_misc.c
index 10eb642..8b707b4 100644
--- a/sys/ia64/ia32/ia32_misc.c
+++ b/sys/ia64/ia32/ia32_misc.c
@@ -106,7 +106,7 @@ ia32_emul_find(td, sgp, prefix, path, pbuf, cflag)
 	struct vattr		vat;
 	struct vattr		vatroot;
 
-	buf = (char *) malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
+	buf = (char *) malloc(MAXPATHLEN, M_TEMP, 0);
 	*pbuf = path;
 
 	for (ptr = buf; (*ptr = *prefix) != '\0'; ptr++, prefix++)
@@ -769,8 +769,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, M_WAITOK);
-	nio = malloc(nsize, M_TEMP, M_WAITOK);
+	oio = malloc(osize, M_TEMP, 0);
+	nio = malloc(nsize, M_TEMP, 0);
 
 	error = 0;
 	if ((error = copyin(uap->iovp, oio, osize)))
@@ -815,8 +815,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, M_WAITOK);
-	nio = malloc(nsize, M_TEMP, M_WAITOK);
+	oio = malloc(osize, M_TEMP, 0);
+	nio = malloc(nsize, M_TEMP, 0);
 
 	error = 0;
 	if ((error = copyin(uap->iovp, oio, osize)))
diff --git a/sys/ia64/ia64/busdma_machdep.c b/sys/ia64/ia64/busdma_machdep.c
index 6496c9b..4bf52d5 100644
--- a/sys/ia64/ia64/busdma_machdep.c
+++ b/sys/ia64/ia64/busdma_machdep.c
@@ -349,7 +349,7 @@ bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags,
 
 	if ((dmat->maxsize <= PAGE_SIZE) && dmat->lowaddr >= ptoa(Maxmem)) {
 		*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
@@ -357,7 +357,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/ia64/ia64/mca.c b/sys/ia64/ia64/mca.c
index 064e6f5..ca24cab 100644
--- a/sys/ia64/ia64/mca.c
+++ b/sys/ia64/ia64/mca.c
@@ -109,7 +109,7 @@ ia64_mca_save_state(int type)
 		mtx_unlock_spin(&mca_info_block_lock);
 
 		totsz = sizeof(struct sysctl_oid) + recsz + 32;
-		oidp = malloc(totsz, M_MCA, M_WAITOK|M_ZERO);
+		oidp = malloc(totsz, M_MCA, M_ZERO);
 		state = (char*)(oidp + 1);
 		name = state + recsz;
 		sprintf(name, "%lld", (long long)seqnr);
@@ -198,7 +198,7 @@ ia64_mca_init(void)
 	}
 	max_size = round_page(max_size);
 
-	p = contigmalloc(max_size, M_TEMP, M_WAITOK, 0ul, 256*1024*1024 - 1,
+	p = contigmalloc(max_size, M_TEMP, 0, 0ul, 256*1024*1024 - 1,
 	    PAGE_SIZE, 256*1024*1024);
 
 	mca_info_block = IA64_PHYS_TO_RR7(ia64_tpa((u_int64_t)p));
diff --git a/sys/ia64/ia64/mp_machdep.c b/sys/ia64/ia64/mp_machdep.c
index 4ef629b..2a7ff9f 100644
--- a/sys/ia64/ia64/mp_machdep.c
+++ b/sys/ia64/ia64/mp_machdep.c
@@ -222,7 +222,7 @@ cpu_mp_start()
 			 * recording a trapframe.
 			 */
 			ks = contigmalloc(KSTACK_PAGES * PAGE_SIZE, M_TEMP,
-					  M_WAITOK,
+					  0,
 					  0ul,
 					  256*1024*1024 - 1,
 					  PAGE_SIZE,
diff --git a/sys/ia64/ia64/pmap.c b/sys/ia64/ia64/pmap.c
index 13a42b6..cc522ba4 100644
--- a/sys/ia64/ia64/pmap.c
+++ b/sys/ia64/ia64/pmap.c
@@ -756,7 +756,7 @@ pmap_new_thread(struct thread *td, int pages)
 	 * 7 address for it which makes it impossible to accidentally
 	 * lose when recording a trapframe.
 	 */
-	ks = contigmalloc(pages * PAGE_SIZE, M_PMAP, M_WAITOK, 0ul,
+	ks = contigmalloc(pages * PAGE_SIZE, M_PMAP, 0, 0ul,
 	    256*1024*1024 - 1, PAGE_SIZE, 256*1024*1024);
 	if (ks == NULL)
 		panic("pmap_new_thread: could not contigmalloc %d pages\n",
@@ -1215,7 +1215,7 @@ pmap_find_pte(vm_offset_t va)
 
 	pte = pmap_find_vhpt(va);
 	if (!pte) {
-		pte = uma_zalloc(ptezone, M_WAITOK);
+		pte = uma_zalloc(ptezone, 0);
 		pte->pte_p = 0;
 	}
 	return pte;
diff --git a/sys/ia64/ia64/sscdisk.c b/sys/ia64/ia64/sscdisk.c
index 1755300..74f10f6 100644
--- a/sys/ia64/ia64/sscdisk.c
+++ b/sys/ia64/ia64/sscdisk.c
@@ -247,7 +247,7 @@ ssccreate(int unit)
 		if (sc->unit == unit)
 			return (NULL);
 	}
-	MALLOC(sc, struct ssc_s *,sizeof(*sc), M_SSC, M_WAITOK | M_ZERO);
+	MALLOC(sc, struct ssc_s *,sizeof(*sc), M_SSC, M_ZERO);
 	LIST_INSERT_HEAD(&ssc_softc_list, sc, list);
 	sc->unit = unit;
 	bioq_init(&sc->bio_queue);