---

yaml --- r: 187315 b: refs/heads/master c: 5ed1091 h: refs/heads/master i: 187313: a60cd87 187311: d66bd0d v: v3
git-mirror · Mar 12, 2010 · d8b5d39 · d8b5d39
1 parent 92f29c1
commit d8b5d39
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e5ab67726f33b50f40db0ccf271ceb3c658554d5
+refs/heads/master: 5ed109103d73b0bafc92e860cead56725231384d
diff --git a/trunk/include/linux/kmod.h b/trunk/include/linux/kmod.h
@@ -27,6 +27,7 @@
 #define KMOD_PATH_LEN 256
 
 #ifdef CONFIG_MODULES
+extern char modprobe_path[]; /* for sysctl */
 /* modprobe exit status on success, -ve on error.  Return value
  * usually useless though. */
 extern int __request_module(bool wait, const char *name, ...) \

diff --git a/trunk/include/linux/module.h b/trunk/include/linux/module.h
@@ -175,6 +175,7 @@ struct notifier_block;
 
 #ifdef CONFIG_MODULES
 
+extern int modules_disabled; /* for sysctl */
 /* Get/put a kernel symbol (calls must be symmetric) */
 void *__symbol_get(const char *symbol);
 void *__symbol_get_gpl(const char *symbol);

diff --git a/trunk/kernel/sysctl.c b/trunk/kernel/sysctl.c
@@ -116,10 +116,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