diff options
Diffstat (limited to 'sys/compat/linux')
-rw-r--r-- | sys/compat/linux/linux_file.c | 2 | ||||
-rw-r--r-- | sys/compat/linux/linux_getcwd.c | 4 | ||||
-rw-r--r-- | sys/compat/linux/linux_ioctl.c | 2 | ||||
-rw-r--r-- | sys/compat/linux/linux_mib.c | 2 | ||||
-rw-r--r-- | sys/compat/linux/linux_sysctl.c | 2 | ||||
-rw-r--r-- | sys/compat/linux/linux_util.c | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c index 2b37dcd..160b2a9 100644 --- a/sys/compat/linux/linux_file.c +++ b/sys/compat/linux/linux_file.c @@ -297,7 +297,7 @@ getdents_common(struct thread *td, struct linux_getdents64_args *args, buflen = max(LINUX_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: diff --git a/sys/compat/linux/linux_getcwd.c b/sys/compat/linux/linux_getcwd.c index bb1c28f..81e84a3 100644 --- a/sys/compat/linux/linux_getcwd.c +++ b/sys/compat/linux/linux_getcwd.c @@ -181,7 +181,7 @@ linux_getcwd_scandir(lvpp, uvpp, bpp, bufp, td) dirbuflen = DIRBLKSIZ; if (dirbuflen < va.va_blocksize) dirbuflen = va.va_blocksize; - dirbuf = (char *)malloc(dirbuflen, M_TEMP, M_WAITOK); + dirbuf = (char *)malloc(dirbuflen, M_TEMP, 0); #if 0 unionread: @@ -429,7 +429,7 @@ linux_getcwd(struct thread *td, struct linux_getcwd_args *args) else if (len < 2) return ERANGE; - path = (char *)malloc(len, M_TEMP, M_WAITOK); + path = (char *)malloc(len, M_TEMP, 0); error = kern___getcwd(td, path, UIO_SYSSPACE, len); if (!error) { diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c index 9f10ba5..eb1b974 100644 --- a/sys/compat/linux/linux_ioctl.c +++ b/sys/compat/linux/linux_ioctl.c @@ -2420,7 +2420,7 @@ linux_ioctl_register_handler(struct linux_ioctl_handler *h) } if (he == NULL) { MALLOC(he, struct handler_element *, sizeof(*he), - M_LINUX, M_WAITOK); + M_LINUX, 0); he->func = h->func; } else TAILQ_REMOVE(&handlers, he, list); diff --git a/sys/compat/linux/linux_mib.c b/sys/compat/linux/linux_mib.c index d9cdd07..4f7f199 100644 --- a/sys/compat/linux/linux_mib.c +++ b/sys/compat/linux/linux_mib.c @@ -139,7 +139,7 @@ linux_get_prison(struct proc *p) if (pr->pr_linux == NULL) { mtx_unlock(&pr->pr_mtx); MALLOC(lpr, struct linux_prison *, sizeof *lpr, - M_PRISON, M_WAITOK|M_ZERO); + M_PRISON, M_ZERO); mtx_lock(&pr->pr_mtx); if (pr->pr_linux == NULL) { pr->pr_linux = lpr; diff --git a/sys/compat/linux/linux_sysctl.c b/sys/compat/linux/linux_sysctl.c index 699b5d6..d737f55 100644 --- a/sys/compat/linux/linux_sysctl.c +++ b/sys/compat/linux/linux_sysctl.c @@ -92,7 +92,7 @@ linux_sysctl(struct thread *td, struct linux_sysctl_args *args) if (la.nlen <= 0 || la.nlen > LINUX_CTL_MAXNAME) return (ENOTDIR); - mib = malloc(la.nlen * sizeof(l_int), M_TEMP, M_WAITOK); + mib = malloc(la.nlen * sizeof(l_int), M_TEMP, 0); error = copyin(la.name, mib, la.nlen * sizeof(l_int)); if (error) { free(mib, M_TEMP); diff --git a/sys/compat/linux/linux_util.c b/sys/compat/linux/linux_util.c index 5bd8c15..bd2c81d 100644 --- a/sys/compat/linux/linux_util.c +++ b/sys/compat/linux/linux_util.c @@ -101,7 +101,7 @@ linux_emul_convpath(td, path, pathseg, pbuf, cflag) char *ptr, *buf, *cp; size_t len, sz; - buf = (char *) malloc(MAXPATHLEN, M_TEMP, M_WAITOK); + buf = (char *) malloc(MAXPATHLEN, M_TEMP, 0); *pbuf = buf; prefix = linux_emul_path; |