Module Name: src
Committed By: matt
Date: Sat Feb 2 14:02:09 UTC 2013
Modified Files:
src/sys/kern: init_sysctl.c kern_sysctl.c
src/sys/sys: sysctl.h
Log Message:
Make the inclusion of <sys/cprng.h> a private matter for sysctl. No reason
to expose the rest of the kernel to it.
To generate a diff of this commit:
cvs rdiff -u -r1.193 -r1.194 src/sys/kern/init_sysctl.c
cvs rdiff -u -r1.238 -r1.239 src/sys/kern/kern_sysctl.c
cvs rdiff -u -r1.206 -r1.207 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/init_sysctl.c
diff -u src/sys/kern/init_sysctl.c:1.193 src/sys/kern/init_sysctl.c:1.194
--- src/sys/kern/init_sysctl.c:1.193 Sat Oct 27 17:18:39 2012
+++ src/sys/kern/init_sysctl.c Sat Feb 2 14:02:09 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: init_sysctl.c,v 1.193 2012/10/27 17:18:39 chs Exp $ */
+/* $NetBSD: init_sysctl.c,v 1.194 2013/02/02 14:02:09 matt Exp $ */
/*-
* Copyright (c) 2003, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -30,13 +30,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_sysctl.c,v 1.193 2012/10/27 17:18:39 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_sysctl.c,v 1.194 2013/02/02 14:02:09 matt Exp $");
#include "opt_sysv.h"
#include "opt_compat_netbsd.h"
#include "opt_modular.h"
#include "pty.h"
+#define SYSCTL_PRIVATE
+
#include <sys/types.h>
#include <sys/param.h>
#include <sys/sysctl.h>
Index: src/sys/kern/kern_sysctl.c
diff -u src/sys/kern/kern_sysctl.c:1.238 src/sys/kern/kern_sysctl.c:1.239
--- src/sys/kern/kern_sysctl.c:1.238 Tue Jan 29 23:00:31 2013
+++ src/sys/kern/kern_sysctl.c Sat Feb 2 14:02:09 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_sysctl.c,v 1.238 2013/01/29 23:00:31 para Exp $ */
+/* $NetBSD: kern_sysctl.c,v 1.239 2013/02/02 14:02:09 matt Exp $ */
/*-
* Copyright (c) 2003, 2007, 2008 The NetBSD Foundation, Inc.
@@ -68,11 +68,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_sysctl.c,v 1.238 2013/01/29 23:00:31 para Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_sysctl.c,v 1.239 2013/02/02 14:02:09 matt Exp $");
#include "opt_defcorename.h"
#include "ksyms.h"
+#define SYSCTL_PRIVATE
+
#include <sys/param.h>
#define __COMPAT_SYSCTL
#include <sys/sysctl.h>
Index: src/sys/sys/sysctl.h
diff -u src/sys/sys/sysctl.h:1.206 src/sys/sys/sysctl.h:1.207
--- src/sys/sys/sysctl.h:1.206 Thu Jan 3 13:19:32 2013
+++ src/sys/sys/sysctl.h Sat Feb 2 14:02:09 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: sysctl.h,v 1.206 2013/01/03 13:19:32 dsl Exp $ */
+/* $NetBSD: sysctl.h,v 1.207 2013/02/02 14:02:09 matt Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -61,7 +61,7 @@
#include <stdbool.h>
#endif
-#ifdef _KERNEL
+#ifdef SYSCTL_PRIVATE
#include <sys/cprng.h>
#endif
@@ -1251,7 +1251,9 @@ MALLOC_DECLARE(M_SYSCTLDATA);
extern const u_int sysctl_lwpflagmap[];
+#ifdef SYSCTL_PRIVATE
extern cprng_strong_t *sysctl_prng;
+#endif
#else /* !_KERNEL */
#include <sys/cdefs.h>
