diff options
author | Warner Losh <imp@FreeBSD.org> | 2003-02-19 05:47:46 +0000 |
---|---|---|
committer | Warner Losh <imp@FreeBSD.org> | 2003-02-19 05:47:46 +0000 |
commit | a163d034fadcfb4a25ca34a2ba5f491c47b6ff69 (patch) | |
tree | 9e20e320fe15ae4bf68f8335fcf9d3e71d3b3614 /sys/ia64 | |
parent | 8f3e32c2b6b9f392e096f096653596f55f2134ae (diff) | |
download | src-a163d034fadcfb4a25ca34a2ba5f491c47b6ff69.tar.gz src-a163d034fadcfb4a25ca34a2ba5f491c47b6ff69.zip |
Back out M_* changes, per decision of the TRB.
Approved by: trb
Notes
Notes:
svn path=/head/; revision=111119
Diffstat (limited to 'sys/ia64')
-rw-r--r-- | sys/ia64/ia32/ia32_misc.c | 10 | ||||
-rw-r--r-- | sys/ia64/ia64/busdma_machdep.c | 4 | ||||
-rw-r--r-- | sys/ia64/ia64/mca.c | 6 | ||||
-rw-r--r-- | sys/ia64/ia64/mp_machdep.c | 2 | ||||
-rw-r--r-- | sys/ia64/ia64/pmap.c | 4 | ||||
-rw-r--r-- | sys/ia64/ia64/sscdisk.c | 2 |
6 files changed, 14 insertions, 14 deletions
diff --git a/sys/ia64/ia32/ia32_misc.c b/sys/ia64/ia32/ia32_misc.c index d593c04ee1b3..c6f26fe7038e 100644 --- a/sys/ia64/ia32/ia32_misc.c +++ b/sys/ia64/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/ia64/ia64/busdma_machdep.c b/sys/ia64/ia64/busdma_machdep.c index d12ea4f7ab13..70b8d4c06a79 100644 --- a/sys/ia64/ia64/busdma_machdep.c +++ b/sys/ia64/ia64/busdma_machdep.c @@ -347,7 +347,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 : 0); + (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK); } else { /* * XXX Use Contigmalloc until it is merged into this facility @@ -355,7 +355,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 : 0, + (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK, 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 4109e3de8931..ff66b7a45470 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_ZERO); + oidp = malloc(totsz, M_MCA, M_WAITOK|M_ZERO); state = (char*)(oidp + 1); name = state + recsz; sprintf(name, "%lld", (long long)seqnr); @@ -199,8 +199,8 @@ ia64_mca_init(void) max_size = round_page(max_size); if (max_size) { - p = contigmalloc(max_size, M_TEMP, 0, 0ul, 256*1024*1024 - 1, - PAGE_SIZE, 256*1024*1024); + p = contigmalloc(max_size, M_TEMP, M_WAITOK, 0ul, + 256*1024*1024 - 1, PAGE_SIZE, 256*1024*1024); mca_info_block = IA64_PHYS_TO_RR7(ia64_tpa((u_int64_t)p)); if (bootverbose) diff --git a/sys/ia64/ia64/mp_machdep.c b/sys/ia64/ia64/mp_machdep.c index 2a7ff9f95f9c..4ef629bdcbe6 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, - 0, + M_WAITOK, 0ul, 256*1024*1024 - 1, PAGE_SIZE, diff --git a/sys/ia64/ia64/pmap.c b/sys/ia64/ia64/pmap.c index 82135fe26a47..0be8b8335e86 100644 --- a/sys/ia64/ia64/pmap.c +++ b/sys/ia64/ia64/pmap.c @@ -748,7 +748,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, 0, 0ul, + ks = contigmalloc(pages * PAGE_SIZE, M_PMAP, M_WAITOK, 0ul, 256*1024*1024 - 1, PAGE_SIZE, 256*1024*1024); if (ks == NULL) panic("pmap_new_thread: could not contigmalloc %d pages\n", @@ -1214,7 +1214,7 @@ pmap_find_pte(vm_offset_t va) pte = pmap_find_vhpt(va); if (!pte) { - pte = uma_zalloc(ptezone, 0); + pte = uma_zalloc(ptezone, M_WAITOK); pte->pte_p = 0; } return pte; diff --git a/sys/ia64/ia64/sscdisk.c b/sys/ia64/ia64/sscdisk.c index 64435b0f1cee..3943cbd122db 100644 --- a/sys/ia64/ia64/sscdisk.c +++ b/sys/ia64/ia64/sscdisk.c @@ -195,7 +195,7 @@ ssccreate(int unit) if (sc->unit == unit) return (NULL); } - MALLOC(sc, struct ssc_s *,sizeof(*sc), M_SSC, M_ZERO); + MALLOC(sc, struct ssc_s *,sizeof(*sc), M_SSC, M_WAITOK | M_ZERO); LIST_INSERT_HEAD(&ssc_softc_list, sc, list); sc->unit = unit; bioq_init(&sc->bio_queue); |