diff options
| author | Philip Guenthe <guenther@cvs.openbsd.org> | 2012-05-02 20:42:26 +0000 |
|---|---|---|
| committer | Philip Guenthe <guenther@cvs.openbsd.org> | 2012-05-02 20:42:26 +0000 |
| commit | ac991706e149d4917b8169f9cf03311896fb2f30 (patch) | |
| tree | afe21fcbc7ae46228a92aac2d8a8bddb7988c15f | |
| parent | 37cd5e67e29a950a9258bd54cfc7146307b39fbb (diff) | |
Oops, previous change had some unrelated changes that shouldn't have been
committed; roll them back.
| -rw-r--r-- | sys/kern/kern_sysctl.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index 907035779df..ba6e06515ce 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_sysctl.c,v 1.222 2012/05/01 03:43:23 guenther Exp $ */ +/* $OpenBSD: kern_sysctl.c,v 1.223 2012/05/02 20:42:25 guenther Exp $ */ /* $NetBSD: kern_sysctl.c,v 1.17 1996/05/20 17:49:05 mrg Exp $ */ /*- @@ -1288,11 +1288,8 @@ sysctl_file2(int *name, u_int namelen, char *where, size_t *sizep, break; } LIST_FOREACH(pp, &allproc, p_list) { - /* - * skip system, exiting, embryonic and undead - * processes, as well as threads - */ - if ((pp->p_flag & (P_SYSTEM | P_WEXIT | P_THREAD)) + /* skip system, exiting, embryonic and undead processes */ + if ((pp->p_flag & P_SYSTEM) || (pp->p_flag & P_WEXIT) || (pp->p_p->ps_flags & PS_EXITING) || pp->p_stat == SIDL || pp->p_stat == SZOMB) continue; @@ -1320,11 +1317,8 @@ sysctl_file2(int *name, u_int namelen, char *where, size_t *sizep, break; case KERN_FILE_BYUID: LIST_FOREACH(pp, &allproc, p_list) { - /* - * skip system, exiting, embryonic and undead - * processes, as well as threads - */ - if ((pp->p_flag & (P_SYSTEM | P_WEXIT | P_THREAD)) + /* skip system, exiting, embryonic and undead processes */ + if ((pp->p_flag & P_SYSTEM) || (pp->p_flag & P_WEXIT) || (pp->p_p->ps_flags & PS_EXITING) || pp->p_stat == SIDL || pp->p_stat == SZOMB) continue; |