From: Dave Young <hidave.darkstar@gmail.com>
To: Rusty Russell <rusty@rustcorp.com.au>,
Patrick McHardy <kaber@trash.net>,
Maciej Rutecki <maciej.rutecki@gmail.com>,
Arjan van de Ven <arjan@linux.intel.com>,
Herbert Xu <herbert@gondor.apana.org.au>,
Frederic Weisbecker <fweisbec@gmail.com>,
Ingo Molnar <mingo@elte.hu>, Steven Rostedt <rostedt@goodmis.org>,
Andrew Morton <akpm@linux-foundation.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
James Morris <jmorris@namei.org>,
"Eric W. Biederman" <ebiederm@xmission.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH 12/18] sysctl extern cleanup - module
Date: Sat, 20 Feb 2010 22:18:09 +0800 [thread overview]
Message-ID: <20100220141809.GK3195@darkstar> (raw)
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@gmail.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, ...) \
reply other threads:[~2010-02-20 14:18 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100220141809.GK3195@darkstar \
--to=hidave.darkstar@gmail.com \
--cc=a.p.zijlstra@chello.nl \
--cc=akpm@linux-foundation.org \
--cc=arjan@linux.intel.com \
--cc=ebiederm@xmission.com \
--cc=fweisbec@gmail.com \
--cc=herbert@gondor.apana.org.au \
--cc=jmorris@namei.org \
--cc=kaber@trash.net \
--cc=linux-kernel@vger.kernel.org \
--cc=maciej.rutecki@gmail.com \
--cc=mingo@elte.hu \
--cc=rostedt@goodmis.org \
--cc=rusty@rustcorp.com.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox