CVS commit: src/sys

[Nicolas Joly]

Module Name:    src
Committed By:   njoly
Date:           Sat Jul 12 09:57:25 UTC 2014

Modified Files:
        src/sys/kern: kern_proc.c
        src/sys/sys: sysctl.h

Log Message:
Allow fill_kproc2() to be used by more than sysctl.


To generate a diff of this commit:
cvs rdiff -u -r1.192 -r1.193 src/sys/kern/kern_proc.c
cvs rdiff -u -r1.212 -r1.213 src/sys/sys/sysctl.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/kern/kern_proc.c
diff -u src/sys/kern/kern_proc.c:1.192 src/sys/kern/kern_proc.c:1.193
--- src/sys/kern/kern_proc.c:1.192	Tue Feb 25 18:30:11 2014
+++ src/sys/kern/kern_proc.c	Sat Jul 12 09:57:25 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_proc.c,v 1.192 2014/02/25 18:30:11 pooka Exp $	*/
+/*	$NetBSD: kern_proc.c,v 1.193 2014/07/12 09:57:25 njoly Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.192 2014/02/25 18:30:11 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.193 2014/07/12 09:57:25 njoly Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_kstack.h"
@@ -212,7 +212,6 @@ static const int	maxuprc	= MAXUPRC;
 
 static int sysctl_doeproc(SYSCTLFN_PROTO);
 static int sysctl_kern_proc_args(SYSCTLFN_PROTO);
-static void fill_kproc2(struct proc *, struct kinfo_proc2 *, bool);
 
 /*
  * The process list descriptors, used during pid allocation and
@@ -2200,7 +2199,7 @@ fill_eproc(struct proc *p, struct eproc 
 /*
  * Fill in a kinfo_proc2 structure for the specified process.
  */
-static void
+void
 fill_kproc2(struct proc *p, struct kinfo_proc2 *ki, bool zombie)
 {
 	struct tty *tp;

Index: src/sys/sys/sysctl.h
diff -u src/sys/sys/sysctl.h:1.212 src/sys/sys/sysctl.h:1.213
--- src/sys/sys/sysctl.h:1.212	Fri Jun 13 15:45:05 2014
+++ src/sys/sys/sysctl.h	Sat Jul 12 09:57:25 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: sysctl.h,v 1.212 2014/06/13 15:45:05 joerg Exp $	*/
+/*	$NetBSD: sysctl.h,v 1.213 2014/07/12 09:57:25 njoly Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -1143,6 +1143,7 @@ typedef int (*sysctlfn)(SYSCTLFN_PROTO);
  * used in more than just sysctl
  */
 void	fill_eproc(struct proc *, struct eproc *, bool);
+void	fill_kproc2(struct proc *, struct kinfo_proc2 *, bool);
 
 /*
  * subsystem setup