summaryrefslogtreecommitdiff
path: root/kernel/sysctl.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-07-08 19:00:17 +0200
committerRusty Russell <rusty@rustcorp.com.au>2008-07-22 19:24:31 +1000
commita1ef5adb4cad43460ebba23c5a78cf4a55bb6a5b (patch)
tree1556b41ff7a03a6941cb363d97204bfef501f9c4 /kernel/sysctl.c
parenta00caa1fa954c734f4214a074727a329a9ba6568 (diff)
downloadlwn-a1ef5adb4cad43460ebba23c5a78cf4a55bb6a5b.tar.gz
lwn-a1ef5adb4cad43460ebba23c5a78cf4a55bb6a5b.zip
remove CONFIG_KMOD from core kernel code
Always compile request_module when the kernel allows modules. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'kernel/sysctl.c')
-rw-r--r--kernel/sysctl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 6b16e16428d8..b859e6b5a767 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -110,7 +110,7 @@ static int min_percpu_pagelist_fract = 8;
static int ngroups_max = NGROUPS_MAX;
-#ifdef CONFIG_KMOD
+#ifdef CONFIG_MODULES
extern char modprobe_path[];
#endif
#ifdef CONFIG_CHR_DEV_SG
@@ -475,7 +475,7 @@ static struct ctl_table kern_table[] = {
.proc_handler = &ftrace_enable_sysctl,
},
#endif
-#ifdef CONFIG_KMOD
+#ifdef CONFIG_MODULES
{
.ctl_name = KERN_MODPROBE,
.procname = "modprobe",