linux-kernel - [PATCH 12/18] sysctl extern cleanup

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20100220141809.GK3195@darkstar>
Date:	Sat, 20 Feb 2010 22:18:09 +0800
From:	Dave Young <hidave.darkstar@...il.com>
To:	Rusty Russell <rusty@...tcorp.com.au>,
	Patrick McHardy <kaber@...sh.net>,
	Maciej Rutecki <maciej.rutecki@...il.com>,
	Arjan van de Ven <arjan@...ux.intel.com>,
	Herbert Xu <herbert@...dor.apana.org.au>,
	Frederic Weisbecker <fweisbec@...il.com>,
	Ingo Molnar <mingo@...e.hu>,
	Steven Rostedt <rostedt@...dmis.org>,
	Andrew Morton <akpm@...ux-foundation.org>,
	Peter Zijlstra <a.p.zijlstra@...llo.nl>,
	James Morris <jmorris@...ei.org>,
	"Eric W. Biederman" <ebiederm@...ssion.com>,
	linux-kernel@...r.kernel.org
Subject: [PATCH 12/18] sysctl extern cleanup - module

Extern declarations in sysctl.c should be move to their own head file,
and then include them in relavant .c files.

Move modprobe_path extern declaration to linux/kmod.h
Move modules_disabled extern declaration to linux/module.h

Signed-off-by: Dave Young <hidave.darkstar@...il.com>
---
 include/linux/kmod.h   |    3 +++
 include/linux/module.h |    6 ++++++
 kernel/sysctl.c        |    4 ----
 3 files changed, 9 insertions(+), 4 deletions(-)

--- linux-2.6.32.orig/include/linux/module.h	2010-02-20 14:02:19.704925558 +0800
+++ linux-2.6.32/include/linux/module.h	2010-02-20 14:29:59.621428095 +0800
@@ -34,6 +34,12 @@
 
 #define MODULE_NAME_LEN MAX_PARAM_PREFIX_LEN
 
+#ifdef CONFIG_SYSCTL
+#ifdef CONFIG_MODULES
+extern int modules_disabled;
+#endif
+#endif
+
 struct kernel_symbol
 {
 	unsigned long value;
--- linux-2.6.32.orig/kernel/sysctl.c	2010-02-20 14:27:44.608107474 +0800
+++ linux-2.6.32/kernel/sysctl.c	2010-02-20 14:27:50.691439411 +0800
@@ -100,10 +100,6 @@ static int min_percpu_pagelist_fract = 8
 
 static int ngroups_max = NGROUPS_MAX;
 
-#ifdef CONFIG_MODULES
-extern char *modprobe_path;
-extern int modules_disabled;
-#endif
 #ifdef CONFIG_CHR_DEV_SG
 extern int sg_big_buff;
 #endif
--- linux-2.6.32.orig/include/linux/kmod.h	2010-02-20 14:02:19.694925349 +0800
+++ linux-2.6.32/include/linux/kmod.h	2010-02-20 14:30:48.918089456 +0800
@@ -28,6 +28,9 @@
 #define KMOD_PATH_LEN 256
 
 #ifdef CONFIG_MODULES
+#ifdef CONFIG_SYSCTL
+extern char *modprobe_path;
+#endif
 /* modprobe exit status on success, -ve on error.  Return value
  * usually useless though. */
 extern int __request_module(bool wait, const char *name, ...) \
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/