Skip to contentSkip to conversation

sysctl extern cleanup - module

PATCH In review Dave Young 2 participants 2 messages Feb 21, 2010 – Feb 22, 2010

Subsystems (2)
Proc sysctl Module support
lore
Share & tools
lore

Dave Young

author
#0 lore raw

PATCH 11/17 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 <[email protected]>
---
 include/linux/kmod.h   |    1 +
 include/linux/module.h |    1 +
 kernel/sysctl.c        |    4 ----
 3 files changed, 2 insertions(+), 4 deletions(-)
include/linux/module.h +1 -0
@@ -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);
kernel/sysctl.c +0 -4
@@ -102,10 +102,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
include/linux/kmod.h +1 -0
@@ -28,6 +28,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, ...) \
Acked-by on v1 11/17
#1 lore raw
Quoted 7 lines · Dave Young

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 <[email protected]>
Acked-by Rusty Russell <[email protected]>

Thanks!
Rusty.

Signature · 1 line
Away travelling 25Feb-26Mar (6 .de + 1 .pl + 17 .lt + 2 .sg)