2010-02-21 14:24:50

by Dave Young

Subject: [PATCH -mm 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(-)

--- linux-2.6.32.orig/include/linux/module.h 2010-02-21 10:07:31.213835197 +0800
+++ linux-2.6.32/include/linux/module.h 2010-02-21 10:09:08.272992941 +0800
@@ -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);
--- linux-2.6.32.orig/kernel/sysctl.c 2010-02-21 10:07:31.193834921 +0800
+++ linux-2.6.32/kernel/sysctl.c 2010-02-21 10:07:46.366333504 +0800
@@ -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
--- linux-2.6.32.orig/include/linux/kmod.h 2010-02-21 10:07:31.203834290 +0800
+++ linux-2.6.32/include/linux/kmod.h 2010-02-21 10:10:25.249652171 +0800
@@ -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, ...) \

2010-02-22 01:10:03

by Rusty Russell

Subject: Re: [PATCH -mm 11/17] sysctl extern cleanup - module

On Mon, 22 Feb 2010 12:54:35 am Dave Young wrote:
> 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.
--
Away travelling 25Feb-26Mar (6 .de + 1 .pl + 17 .lt + 2 .sg)