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>

diff --git a/include/linux/kmod.h b/include/linux/kmod.h
index 9bdb28d6660f27e2114da17e5481dea94cf57f7b..0509c4ce485793e748054aa558e559691a6af79d 100644 (file)
--- a/include/linux/kmod.h
+++ b/include/linux/kmod.h
@@ -25,7 +25,7 @@
 
 #define KMOD_PATH_LEN 256
 
-#ifdef CONFIG_KMOD
+#ifdef CONFIG_MODULES
 /* modprobe exit status on success, -ve on error.  Return value
  * usually useless though. */
 extern int request_module(const char * name, ...) __attribute__ ((format (printf, 1, 2)));

diff --git a/kernel/exec_domain.c b/kernel/exec_domain.c
index a9e6bad9f706b05f96b2e7c4e16e6cb75acd6f4e..c1ef192aa65592b6286e6c224969e8af1eed3d81 100644 (file)
--- a/kernel/exec_domain.c
+++ b/kernel/exec_domain.c
@@ -65,7 +65,7 @@ lookup_exec_domain(u_long personality)
                                goto out;
        }
 
-#ifdef CONFIG_KMOD
+#ifdef CONFIG_MODULES
        read_unlock(&exec_domains_lock);
        request_module("personality-%ld", pers);
        read_lock(&exec_domains_lock);

diff --git a/kernel/kmod.c b/kernel/kmod.c
index 8df97d3dfda8611423d7cac323cb9ef5dce5170c..90d7af1c16554ce63c49ad64184fb6077f3b96fc 100644 (file)
--- a/kernel/kmod.c
+++ b/kernel/kmod.c
@@ -42,7 +42,7 @@ extern int max_threads;
 
 static struct workqueue_struct *khelper_wq;
 
-#ifdef CONFIG_KMOD
+#ifdef CONFIG_MODULES
 
 /*
        modprobe_path is set via /proc/sys.

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 6b16e16428d8f57febcb2e67dde5b6c2fd211a4e..b859e6b5a767541b2b9016b6a8217b7ea595be8c 100644 (file)
--- 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",