diff options
| author | imp <imp@FreeBSD.org> | 2003-02-19 05:47:46 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2003-02-19 05:47:46 +0000 |
| commit | cf874b345d0f766fb64cf4737e1c85ccc78d2bee (patch) | |
| tree | 9e20e320fe15ae4bf68f8335fcf9d3e71d3b3614 /sys/alpha | |
| parent | b72619cecb8265d3efb3781b0acff1380762c173 (diff) | |
| download | FreeBSD-src-cf874b345d0f766fb64cf4737e1c85ccc78d2bee.zip FreeBSD-src-cf874b345d0f766fb64cf4737e1c85ccc78d2bee.tar.gz | |
Back out M_* changes, per decision of the TRB.
Approved by: trb
Diffstat (limited to 'sys/alpha')
| -rw-r--r-- | sys/alpha/alpha/busdma_machdep.c | 4 | ||||
| -rw-r--r-- | sys/alpha/osf1/imgact_osf1.c | 6 | ||||
| -rw-r--r-- | sys/alpha/osf1/osf1_misc.c | 10 |
3 files changed, 10 insertions, 10 deletions
diff --git a/sys/alpha/alpha/busdma_machdep.c b/sys/alpha/alpha/busdma_machdep.c index 8b70104..169231b 100644 --- a/sys/alpha/alpha/busdma_machdep.c +++ b/sys/alpha/alpha/busdma_machdep.c @@ -360,7 +360,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 @@ -368,7 +368,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/alpha/osf1/imgact_osf1.c b/sys/alpha/osf1/imgact_osf1.c index 5db50d0..d633182 100644 --- a/sys/alpha/osf1/imgact_osf1.c +++ b/sys/alpha/osf1/imgact_osf1.c @@ -112,7 +112,7 @@ exec_osf1_imgact(struct image_params *imgp) printf("unknown ecoff magic %x\n", eap->magic); return ENOEXEC; } - osf_auxargs = malloc(sizeof(Osf_Auxargs), M_TEMP, M_ZERO); + osf_auxargs = malloc(sizeof(Osf_Auxargs), M_TEMP, M_WAITOK | M_ZERO); imgp->auxargs = osf_auxargs; osf_auxargs->executable = osf_auxargs->exec_path; path_not_saved = copyinstr(imgp->fname, osf_auxargs->executable, @@ -135,7 +135,7 @@ exec_osf1_imgact(struct image_params *imgp) * page of the loader. */ ndp = (struct nameidata *)malloc(sizeof(struct nameidata), - M_TEMP, 0); + M_TEMP, M_WAITOK); NDINIT(ndp, LOOKUP, LOCKLEAF | FOLLOW | SAVENAME, UIO_SYSSPACE, "/compat/osf1/sbin/loader", FIRST_THREAD_IN_PROC(imgp->proc)); @@ -218,7 +218,7 @@ exec_osf1_imgact(struct image_params *imgp) raw_dend = (eap->data_start + eap->dsize); if (dend > raw_dend) { caddr_t zeros; - zeros = malloc(dend-raw_dend, M_TEMP, M_ZERO); + zeros = malloc(dend-raw_dend,M_TEMP,M_WAITOK|M_ZERO); if ((error = copyout(zeros, (caddr_t)raw_dend, dend-raw_dend))) { uprintf("Can't zero start of bss, error %d\n",error); diff --git a/sys/alpha/osf1/osf1_misc.c b/sys/alpha/osf1/osf1_misc.c index adf76e3..8b49723 100644 --- a/sys/alpha/osf1/osf1_misc.c +++ b/sys/alpha/osf1/osf1_misc.c @@ -120,7 +120,7 @@ osf1_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++) @@ -1180,8 +1180,8 @@ osf1_readv(td, uap) osize = uap->iovcnt * sizeof (struct osf1_iovec); 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))) @@ -1229,8 +1229,8 @@ osf1_writev(td, uap) osize = uap->iovcnt * sizeof (struct osf1_iovec); 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))) |
