diff options
author | alfred <alfred@FreeBSD.org> | 2003-01-21 08:56:16 +0000 |
---|---|---|
committer | alfred <alfred@FreeBSD.org> | 2003-01-21 08:56:16 +0000 |
commit | bf8e8a6e8f0bd9165109f0a258730dd242299815 (patch) | |
tree | f16a2fb9fa7a7fbc4c19e981d278d5f6eb53234d /sys/kern/sys_pipe.c | |
parent | 2180deee00350fff613a1d1d1328eddc4c0ba9c8 (diff) | |
download | FreeBSD-src-bf8e8a6e8f0bd9165109f0a258730dd242299815.zip FreeBSD-src-bf8e8a6e8f0bd9165109f0a258730dd242299815.tar.gz |
Remove M_TRYWAIT/M_WAITOK/M_WAIT. Callers should use 0.
Merge M_NOWAIT/M_DONTWAIT into a single flag M_NOWAIT.
Diffstat (limited to 'sys/kern/sys_pipe.c')
-rw-r--r-- | sys/kern/sys_pipe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c index 915ee3e..937e909 100644 --- a/sys/kern/sys_pipe.c +++ b/sys/kern/sys_pipe.c @@ -206,7 +206,7 @@ pipe(td, uap) KASSERT(pipe_zone != NULL, ("pipe_zone not initialized")); - pmtx = malloc(sizeof(*pmtx), M_TEMP, M_WAITOK | M_ZERO); + pmtx = malloc(sizeof(*pmtx), M_TEMP, M_ZERO); rpipe = wpipe = NULL; if (pipe_create(&rpipe) || pipe_create(&wpipe)) { @@ -346,7 +346,7 @@ pipe_create(cpipep) struct pipe *cpipe; int error; - *cpipep = uma_zalloc(pipe_zone, M_WAITOK); + *cpipep = uma_zalloc(pipe_zone, 0); if (*cpipep == NULL) return (ENOMEM); |