summaryrefslogtreecommitdiff
path: root/sys/kern/kern_resource.c
diff options
context:
space:
mode:
authorAlfred Perlstein <alfred@FreeBSD.org>2003-01-21 08:56:16 +0000
committerAlfred Perlstein <alfred@FreeBSD.org>2003-01-21 08:56:16 +0000
commit44956c9863dc03344b03bdf6a83acf4e743f8e50 (patch)
treef16a2fb9fa7a7fbc4c19e981d278d5f6eb53234d /sys/kern/kern_resource.c
parent1326e03f7f8018164ece91fc0a3f15f9c65ff64a (diff)
Notes
Diffstat (limited to 'sys/kern/kern_resource.c')
-rw-r--r--sys/kern/kern_resource.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c
index a0f263df87ab..4ade8903fd1b 100644
--- a/sys/kern/kern_resource.c
+++ b/sys/kern/kern_resource.c
@@ -839,7 +839,7 @@ limcopy(lim)
register struct plimit *copy;
MALLOC(copy, struct plimit *, sizeof(struct plimit),
- M_SUBPROC, M_WAITOK);
+ M_SUBPROC, 0);
bcopy(lim->pl_rlimit, copy->pl_rlimit, sizeof(struct plimit));
copy->p_lflags = 0;
copy->p_refcnt = 1;
@@ -896,7 +896,7 @@ uifind(uid)
struct uidinfo *old_uip;
mtx_unlock(&uihashtbl_mtx);
- uip = malloc(sizeof(*uip), M_UIDINFO, M_WAITOK | M_ZERO);
+ uip = malloc(sizeof(*uip), M_UIDINFO, M_ZERO);
mtx_lock(&uihashtbl_mtx);
/*
* There's a chance someone created our uidinfo while we