Commit a1ef5adb authored by Johannes Berg's avatar Johannes Berg Committed by Rusty Russell
Browse files

remove CONFIG_KMOD from core kernel code 



Always compile request_module when the kernel allows modules.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent a00caa1f

include/linux/kmod.h

+1 −1
Original line number Diff line number Diff line
@@ -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)));

kernel/exec_domain.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

kernel/kmod.c

+1 −1
Original line number Diff line number Diff line
@@ -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.

kernel/sysctl.c

+2 −2
Original line number Diff line number Diff line
@@ -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",