diff options
| author | imp <imp@FreeBSD.org> | 2003-02-19 05:47:46 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2003-02-19 05:47:46 +0000 |
| commit | cf874b345d0f766fb64cf4737e1c85ccc78d2bee (patch) | |
| tree | 9e20e320fe15ae4bf68f8335fcf9d3e71d3b3614 /sys/kern/kern_event.c | |
| parent | b72619cecb8265d3efb3781b0acff1380762c173 (diff) | |
| download | FreeBSD-src-cf874b345d0f766fb64cf4737e1c85ccc78d2bee.zip FreeBSD-src-cf874b345d0f766fb64cf4737e1c85ccc78d2bee.tar.gz | |
Back out M_* changes, per decision of the TRB.
Approved by: trb
Diffstat (limited to 'sys/kern/kern_event.c')
| -rw-r--r-- | sys/kern/kern_event.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 4910b7e..8c552d1 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -330,7 +330,7 @@ filt_timerattach(struct knote *kn) kn->kn_flags |= EV_CLEAR; /* automatically set */ MALLOC(calloutp, struct callout *, sizeof(*calloutp), - M_KQUEUE, 0); + M_KQUEUE, M_WAITOK); callout_init(calloutp, 0); callout_reset(calloutp, tticks, filt_timerexpire, kn); kn->kn_hook = calloutp; @@ -372,7 +372,7 @@ kqueue(struct thread *td, struct kqueue_args *uap) error = falloc(td, &fp, &fd); if (error) goto done2; - kq = malloc(sizeof(struct kqueue), M_KQUEUE, M_ZERO); + kq = malloc(sizeof(struct kqueue), M_KQUEUE, M_WAITOK | M_ZERO); TAILQ_INIT(&kq->kq_head); FILE_LOCK(fp); fp->f_flag = FREAD | FWRITE; @@ -980,7 +980,7 @@ knote_attach(struct knote *kn, struct filedesc *fdp) size += KQEXTENT; FILEDESC_UNLOCK(fdp); MALLOC(list, struct klist *, - size * sizeof(struct klist *), M_KQUEUE, 0); + size * sizeof(struct klist *), M_KQUEUE, M_WAITOK); FILEDESC_LOCK(fdp); if (fdp->fd_knlistsize > kn->kn_id) { FREE(list, M_KQUEUE); @@ -1074,7 +1074,7 @@ SYSINIT(knote, SI_SUB_PSEUDO, SI_ORDER_ANY, knote_init, NULL) static struct knote * knote_alloc(void) { - return ((struct knote *)uma_zalloc(knote_zone, 0)); + return ((struct knote *)uma_zalloc(knote_zone, M_WAITOK)); } static void |
