adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 03:36:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

remove CONFIG_KMOD from core kernel code

Browse source 
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:
Johannes Berg 2008-07-08 19:00:17 +02:00 committed by Rusty Russell
parent a00caa1fa9
commit a1ef5adb4c
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/linux/kmod.h
View file

@ -25,7 +25,7 @@
#define KMOD_PATH_LEN 256 #define KMOD_PATH_LEN 256
#ifdef CONFIG_KMOD #ifdef CONFIG_MODULES
/* modprobe exit status on success, -ve on error. Return value /* modprobe exit status on success, -ve on error. Return value
* usually useless though. */ * usually useless though. */
extern int request_module(const char * name, ...) __attribute__ ((format (printf, 1, 2))); extern int request_module(const char * name, ...) __attribute__ ((format (printf, 1, 2)));

2
kernel/exec_domain.c
View file

@ -65,7 +65,7 @@ lookup_exec_domain(u_long personality)
goto out; goto out;
} }
#ifdef CONFIG_KMOD #ifdef CONFIG_MODULES
read_unlock(&exec_domains_lock); read_unlock(&exec_domains_lock);
request_module("personality-%ld", pers); request_module("personality-%ld", pers);
read_lock(&exec_domains_lock); read_lock(&exec_domains_lock);

2
kernel/kmod.c
View file

@ -42,7 +42,7 @@ extern int max_threads;
static struct workqueue_struct *khelper_wq; static struct workqueue_struct *khelper_wq;
#ifdef CONFIG_KMOD #ifdef CONFIG_MODULES
/* /*
modprobe_path is set via /proc/sys. modprobe_path is set via /proc/sys.

4
kernel/sysctl.c
View file

@ -110,7 +110,7 @@ static int min_percpu_pagelist_fract = 8;
static int ngroups_max = NGROUPS_MAX; static int ngroups_max = NGROUPS_MAX;
#ifdef CONFIG_KMOD #ifdef CONFIG_MODULES
extern char modprobe_path[]; extern char modprobe_path[];
#endif #endif
#ifdef CONFIG_CHR_DEV_SG #ifdef CONFIG_CHR_DEV_SG
@ -475,7 +475,7 @@ static struct ctl_table kern_table[] = {
.proc_handler = &ftrace_enable_sysctl, .proc_handler = &ftrace_enable_sysctl,
}, },
#endif #endif
#ifdef CONFIG_KMOD #ifdef CONFIG_MODULES
{ {
.ctl_name = KERN_MODPROBE, .ctl_name = KERN_MODPROBE,
.procname = "modprobe", .procname = "modprobe",