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/uipc_sem.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/uipc_sem.c')
-rw-r--r-- | sys/kern/uipc_sem.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/kern/uipc_sem.c b/sys/kern/uipc_sem.c index e3912e1..3d9d5b55 100644 --- a/sys/kern/uipc_sem.c +++ b/sys/kern/uipc_sem.c @@ -188,7 +188,7 @@ sem_create(td, name, ksret, mode, value) uc = p->p_ucred; if (value > SEM_VALUE_MAX) return (EINVAL); - ret = malloc(sizeof(*ret), M_SEM, M_WAITOK | M_ZERO); + ret = malloc(sizeof(*ret), M_SEM, M_ZERO); if (name != NULL) { len = strlen(name); if (len > SEM_MAX_NAMELEN) { @@ -200,7 +200,7 @@ sem_create(td, name, ksret, mode, value) free(ret, M_SEM); return (EINVAL); } - ret->ks_name = malloc(len + 1, M_SEM, M_WAITOK); + ret->ks_name = malloc(len + 1, M_SEM, 0); strcpy(ret->ks_name, name); } else { ret->ks_name = NULL; @@ -504,7 +504,7 @@ sem_enter(p, ks) { struct kuser *ku, *k; - ku = malloc(sizeof(*ku), M_SEM, M_WAITOK); + ku = malloc(sizeof(*ku), M_SEM, 0); ku->ku_pid = p->p_pid; mtx_lock(&sem_lock); k = sem_getuser(p, ks); |