diff options
-rw-r--r-- | include/linux/kmod.h | 1 | ||||
-rw-r--r-- | include/linux/module.h | 1 | ||||
-rw-r--r-- | kernel/sysctl.c | 4 |
3 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/kmod.h b/include/linux/kmod.h index 384ca8bbf1ac..facb27fe7de0 100644 --- a/include/linux/kmod.h +++ b/include/linux/kmod.h | |||
@@ -27,6 +27,7 @@ | |||
27 | #define KMOD_PATH_LEN 256 | 27 | #define KMOD_PATH_LEN 256 |
28 | 28 | ||
29 | #ifdef CONFIG_MODULES | 29 | #ifdef CONFIG_MODULES |
30 | extern char modprobe_path[]; /* for sysctl */ | ||
30 | /* modprobe exit status on success, -ve on error. Return value | 31 | /* modprobe exit status on success, -ve on error. Return value |
31 | * usually useless though. */ | 32 | * usually useless though. */ |
32 | extern int __request_module(bool wait, const char *name, ...) \ | 33 | extern int __request_module(bool wait, const char *name, ...) \ |
diff --git a/include/linux/module.h b/include/linux/module.h index dd618eb026aa..5e869ffd34aa 100644 --- a/include/linux/module.h +++ b/include/linux/module.h | |||
@@ -175,6 +175,7 @@ struct notifier_block; | |||
175 | 175 | ||
176 | #ifdef CONFIG_MODULES | 176 | #ifdef CONFIG_MODULES |
177 | 177 | ||
178 | extern int modules_disabled; /* for sysctl */ | ||
178 | /* Get/put a kernel symbol (calls must be symmetric) */ | 179 | /* Get/put a kernel symbol (calls must be symmetric) */ |
179 | void *__symbol_get(const char *symbol); | 180 | void *__symbol_get(const char *symbol); |
180 | void *__symbol_get_gpl(const char *symbol); | 181 | void *__symbol_get_gpl(const char *symbol); |
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index f18aaa7b0d65..44e9492368fd 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
@@ -116,10 +116,6 @@ static int min_percpu_pagelist_fract = 8; | |||
116 | 116 | ||
117 | static int ngroups_max = NGROUPS_MAX; | 117 | static int ngroups_max = NGROUPS_MAX; |
118 | 118 | ||
119 | #ifdef CONFIG_MODULES | ||
120 | extern char modprobe_path[]; | ||
121 | extern int modules_disabled; | ||
122 | #endif | ||
123 | #ifdef CONFIG_CHR_DEV_SG | 119 | #ifdef CONFIG_CHR_DEV_SG |
124 | extern int sg_big_buff; | 120 | extern int sg_big_buff; |
125 | #endif | 121 | #endif |