Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/sys Only define 'struct kinfo_proc' if _KERNEL or _KMEMU...



details:   https://anonhg.NetBSD.org/src/rev/09af1dbfd20d
branches:  trunk
changeset: 783660:09af1dbfd20d
user:      dsl <dsl%NetBSD.org@localhost>
date:      Wed Jan 02 19:29:40 2013 +0000

description:
Only define 'struct kinfo_proc' if _KERNEL or _KMEMUSER is defined.
All 'normal' programs should be using kinfo_proc2 instead.

diffstat:

 sys/sys/sysctl.h |  13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diffs (53 lines):

diff -r d24d729474b8 -r 09af1dbfd20d sys/sys/sysctl.h
--- a/sys/sys/sysctl.h  Wed Jan 02 19:24:30 2013 +0000
+++ b/sys/sys/sysctl.h  Wed Jan 02 19:29:40 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sysctl.h,v 1.204 2012/12/01 11:41:50 mbalmer Exp $     */
+/*     $NetBSD: sysctl.h,v 1.205 2013/01/02 19:29:40 dsl Exp $ */
 
 /*
  * Copyright (c) 1989, 1993
@@ -70,6 +70,8 @@
  * respective subsystem header files.
  */
 
+struct sysctlnode;
+
 #define        CTL_MAXNAME     12      /* largest number of components supported */
 #define SYSCTL_NAMELEN 32      /* longest name allowed for a node */
 
@@ -411,6 +413,8 @@
        gid_t           cr_groups[NGROUPS];     /* groups */
 };
 
+#if defined(_KERNEL) || defined(_KMEMUSER)
+
 /*
  * KERN_PROC subtype ops return arrays of augmented proc structures:
  */
@@ -434,14 +438,13 @@
                short   e_xrssize;              /* text rss */
                short   e_xccount;              /* text references */
                short   e_xswrss;
-               long    e_flag;
-#define        EPROC_CTTY      0x01    /* controlling tty vnode active */
-#define        EPROC_SLEADER   0x02    /* session leader */
+               long    e_flag;                 /* see p_eflag  below */
                char    e_login[MAXLOGNAME];    /* setlogin() name */
                pid_t   e_sid;                  /* session id */
                long    e_spare[3];
        } kp_eproc;
 };
+#endif /* defined(_KERNEL) || defined(_KMEMUSER) */
 
 /*
  * Convert pointer to 64 bit unsigned integer for struct
@@ -486,6 +489,8 @@
        uint64_t p_ru;                  /* PTR: Exit information. XXX */
 
        int32_t p_eflag;                /* LONG: extra kinfo_proc2 flags */
+#define        EPROC_CTTY      0x01    /* controlling tty vnode active */
+#define        EPROC_SLEADER   0x02    /* session leader */
        int32_t p_exitsig;              /* INT: signal to sent to parent on exit */
        int32_t p_flag;                 /* INT: P_* flags. */
 



Home | Main Index | Thread Index | Old Index