diff options
Diffstat (limited to 'sys/compat/svr4')
-rw-r--r-- | sys/compat/svr4/svr4_filio.c | 2 | ||||
-rw-r--r-- | sys/compat/svr4/svr4_misc.c | 4 | ||||
-rw-r--r-- | sys/compat/svr4/svr4_socket.c | 2 | ||||
-rw-r--r-- | sys/compat/svr4/svr4_stream.c | 8 | ||||
-rw-r--r-- | sys/compat/svr4/svr4_sysvec.c | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/sys/compat/svr4/svr4_filio.c b/sys/compat/svr4/svr4_filio.c index ca1b8db..ab98dce 100644 --- a/sys/compat/svr4/svr4_filio.c +++ b/sys/compat/svr4/svr4_filio.c @@ -68,7 +68,7 @@ svr4_sys_poll(td, uap) pa.timeout = uap->timeout; siz = uap->nfds * sizeof(struct pollfd); - pfd = (struct pollfd *)malloc(siz, M_TEMP, M_WAITOK); + pfd = (struct pollfd *)malloc(siz, M_TEMP, 0); error = poll(td, (struct poll_args *)uap); diff --git a/sys/compat/svr4/svr4_misc.c b/sys/compat/svr4/svr4_misc.c index 2db3c96..5938993 100644 --- a/sys/compat/svr4/svr4_misc.c +++ b/sys/compat/svr4/svr4_misc.c @@ -296,7 +296,7 @@ svr4_sys_getdents64(td, uap) #define DIRBLKSIZ 512 /* XXX we used to use ufs's DIRBLKSIZ */ buflen = max(DIRBLKSIZ, nbytes); buflen = min(buflen, MAXBSIZE); - buf = malloc(buflen, M_TEMP, M_WAITOK); + buf = malloc(buflen, M_TEMP, 0); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); again: aiov.iov_base = buf; @@ -459,7 +459,7 @@ svr4_sys_getdents(td, uap) } buflen = min(MAXBSIZE, uap->nbytes); - buf = malloc(buflen, M_TEMP, M_WAITOK); + buf = malloc(buflen, M_TEMP, 0); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); off = fp->f_offset; again: diff --git a/sys/compat/svr4/svr4_socket.c b/sys/compat/svr4/svr4_socket.c index b5da396..54274f9 100644 --- a/sys/compat/svr4/svr4_socket.c +++ b/sys/compat/svr4/svr4_socket.c @@ -138,7 +138,7 @@ svr4_add_socket(td, path, st) atomic_store_rel_int(&svr4_str_initialized, 2); } - e = malloc(sizeof(*e), M_TEMP, M_WAITOK); + e = malloc(sizeof(*e), M_TEMP, 0); e->cookie = NULL; e->dev = st->st_dev; e->ino = st->st_ino; diff --git a/sys/compat/svr4/svr4_stream.c b/sys/compat/svr4/svr4_stream.c index 9a5c465..6742009 100644 --- a/sys/compat/svr4/svr4_stream.c +++ b/sys/compat/svr4/svr4_stream.c @@ -212,7 +212,7 @@ svr4_sendit(td, s, mp, flags) if (KTRPOINT(td, KTR_GENIO)) { int iovlen = auio.uio_iovcnt * sizeof (struct iovec); - MALLOC(ktriov, struct iovec *, iovlen, M_TEMP, M_WAITOK); + MALLOC(ktriov, struct iovec *, iovlen, M_TEMP, 0); bcopy((caddr_t)auio.uio_iov, (caddr_t)ktriov, iovlen); ktruio = auio; } @@ -297,7 +297,7 @@ svr4_recvit(td, s, mp, namelenp) if (KTRPOINT(td, KTR_GENIO)) { int iovlen = auio.uio_iovcnt * sizeof (struct iovec); - MALLOC(ktriov, struct iovec *, iovlen, M_TEMP, M_WAITOK); + MALLOC(ktriov, struct iovec *, iovlen, M_TEMP, 0); bcopy((caddr_t)auio.uio_iov, (caddr_t)ktriov, iovlen); ktruio = auio; } @@ -408,7 +408,7 @@ show_ioc(str, ioc) const char *str; struct svr4_strioctl *ioc; { - u_char *ptr = (u_char *) malloc(ioc->len, M_TEMP, M_WAITOK); + u_char *ptr = (u_char *) malloc(ioc->len, M_TEMP, 0); int error; uprintf("%s cmd = %ld, timeout = %d, len = %d, buf = %p { ", @@ -444,7 +444,7 @@ show_strbuf(str) len = maxlen; if (len > 0) { - ptr = (u_char *) malloc(len, M_TEMP, M_WAITOK); + ptr = (u_char *) malloc(len, M_TEMP, 0); if ((error = copyin(str->buf, ptr, len)) != 0) { free((char *) ptr, M_TEMP); diff --git a/sys/compat/svr4/svr4_sysvec.c b/sys/compat/svr4/svr4_sysvec.c index 1d4ad6e..508e9dc 100644 --- a/sys/compat/svr4/svr4_sysvec.c +++ b/sys/compat/svr4/svr4_sysvec.c @@ -267,7 +267,7 @@ svr4_emul_find(td, sgp, prefix, path, pbuf, cflag) char *ptr, *buf, *cp; size_t sz, len; - 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++) |