Index: sys/kern/kern_event.c =================================================================== --- sys/kern/kern_event.c +++ sys/kern/kern_event.c @@ -481,21 +481,17 @@ filt_proc(struct knote *kn, long hint) { struct proc *p; - u_int event; p = kn->kn_ptr.p_proc; if (p == NULL) /* already activated, from attach filter */ return (0); - /* Mask off extra data. */ - event = (u_int)hint & NOTE_PCTRLMASK; - /* If the user is interested in this event, record it. */ - if (kn->kn_sfflags & event) - kn->kn_fflags |= event; + if ((kn->kn_sfflags & hint) != 0) + kn->kn_fflags |= hint; /* Process is gone, so flag the event as finished. */ - if (event == NOTE_EXIT) { + if (hint == NOTE_EXIT) { kn->kn_flags |= EV_EOF | EV_ONESHOT; kn->kn_ptr.p_proc = NULL; if (kn->kn_fflags & NOTE_EXIT) Index: sys/kern/sys_procdesc.c =================================================================== --- sys/kern/sys_procdesc.c +++ sys/kern/sys_procdesc.c @@ -464,7 +464,6 @@ procdesc_kqops_event(struct knote *kn, long hint) { struct procdesc *pd; - u_int event; pd = kn->kn_fp->f_data; if (hint == 0) { @@ -472,18 +471,15 @@ * Initial test after registration. Generate a NOTE_EXIT in * case the process already terminated before registration. */ - event = pd->pd_flags & PDF_EXITED ? NOTE_EXIT : 0; - } else { - /* Mask off extra data. */ - event = (u_int)hint & NOTE_PCTRLMASK; + hint = pd->pd_flags & PDF_EXITED ? NOTE_EXIT : 0; } /* If the user is interested in this event, record it. */ - if (kn->kn_sfflags & event) - kn->kn_fflags |= event; + if ((kn->kn_sfflags & hint) != 0) + kn->kn_fflags |= hint; /* Process is gone, so flag the event as finished. */ - if (event == NOTE_EXIT) { + if (hint == NOTE_EXIT) { kn->kn_flags |= EV_EOF | EV_ONESHOT; if (kn->kn_fflags & NOTE_EXIT) kn->kn_data = pd->pd_xstat; Index: sys/sys/event.h =================================================================== --- sys/sys/event.h +++ sys/sys/event.h @@ -141,8 +141,6 @@ #define NOTE_EXIT 0x80000000 /* process exited */ #define NOTE_FORK 0x40000000 /* process forked */ #define NOTE_EXEC 0x20000000 /* process exec'd */ -#define NOTE_PCTRLMASK 0xf0000000 /* mask for hint bits */ -#define NOTE_PDATAMASK 0x000fffff /* mask for pid */ /* additional flags for EVFILT_PROC */ #define NOTE_TRACK 0x00000001 /* follow across forks */