Commit d0d05f60 authored by Joel Granados's avatar Joel Granados
Browse files

module: Move modprobe_path and modules_disabled ctl_tables into the module subsys 



Move module sysctl (modprobe_path and modules_disabled) out of sysctl.c
and into the modules subsystem. Make modules_disabled static as it no
longer needs to be exported. Remove module.h from the includes in sysctl
as it no longer uses any module exported variables.

This is part of a greater effort to move ctl tables into their
respective subsystems which will reduce the merge conflicts in
kernel/sysctl.c.

Reviewed-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
Reviewed-by: default avatarPetr Pavlu <petr.pavlu@suse.com>
Signed-off-by: default avatarJoel Granados <joel.granados@kernel.org>
parent 19272b37

include/linux/kmod.h

+0 −3
Original line number Diff line number Diff line
@@ -14,10 +14,7 @@ 
#include <linux/workqueue.h>

#include <linux/sysctl.h>



#define KMOD_PATH_LEN 256



#ifdef CONFIG_MODULES

extern char modprobe_path[]; /* for sysctl */

/* modprobe exit status on success, -ve on error.  Return value

 * usually useless though. */

extern __printf(2, 3)

include/linux/module.h

+0 −1
Original line number Diff line number Diff line
@@ -304,7 +304,6 @@ struct notifier_block; 


#ifdef CONFIG_MODULES



extern int modules_disabled; /* for sysctl */

/* Get/put a kernel symbol (calls must be symmetric) */

void *__symbol_get(const char *symbol);

void *__symbol_get_gpl(const char *symbol);

kernel/module/internal.h

+3 −0
Original line number Diff line number Diff line
@@ -58,6 +58,9 @@ extern const struct kernel_symbol __stop___ksymtab_gpl[]; 
extern const u32 __start___kcrctab[];

extern const u32 __start___kcrctab_gpl[];



#define KMOD_PATH_LEN 256

extern char modprobe_path[];



struct load_info {

	const char *name;

	/* pointer to module in temporary copy, freed at end of load_module() */

kernel/module/main.c

+29 −1
Original line number Diff line number Diff line
@@ -126,9 +126,37 @@ static void mod_update_bounds(struct module *mod) 
}



/* Block module loading/unloading? */

int modules_disabled;

static int modules_disabled;

core_param(nomodule, modules_disabled, bint, 0);



static const struct ctl_table module_sysctl_table[] = {

	{

		.procname	= "modprobe",

		.data		= &modprobe_path,

		.maxlen		= KMOD_PATH_LEN,

		.mode		= 0644,

		.proc_handler	= proc_dostring,

	},

	{

		.procname	= "modules_disabled",

		.data		= &modules_disabled,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		/* only handle a transition from default "0" to "1" */

		.proc_handler	= proc_dointvec_minmax,

		.extra1		= SYSCTL_ONE,

		.extra2		= SYSCTL_ONE,

	},

};



static int __init init_module_sysctl(void)

{

	register_sysctl_init("kernel", module_sysctl_table);

	return 0;

}



subsys_initcall(init_module_sysctl);



/* Waiting for a module to finish initializing? */

static DECLARE_WAIT_QUEUE_HEAD(module_wq);

kernel/sysctl.c

+0 −20
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
 *  Removed it and replaced it with older style, 03/23/00, Bill Wendling

 */



#include <linux/module.h>

#include <linux/sysctl.h>

#include <linux/bitmap.h>

#include <linux/printk.h>
@@ -1616,25 +1615,6 @@ static const struct ctl_table kern_table[] = { 
		.proc_handler	= proc_dointvec,

	},

#endif

#ifdef CONFIG_MODULES

	{

		.procname	= "modprobe",

		.data		= &modprobe_path,

		.maxlen		= KMOD_PATH_LEN,

		.mode		= 0644,

		.proc_handler	= proc_dostring,

	},

	{

		.procname	= "modules_disabled",

		.data		= &modules_disabled,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		/* only handle a transition from default "0" to "1" */

		.proc_handler	= proc_dointvec_minmax,

		.extra1		= SYSCTL_ONE,

		.extra2		= SYSCTL_ONE,

	},

#endif

#ifdef CONFIG_UEVENT_HELPER

	{

		.procname	= "hotplug",