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>
This commit is contained in:
parent
a00caa1fa9
commit
a1ef5adb4c
|
@ -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)));
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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",
|
||||
|
|
Loading…
Reference in New Issue