Commit 88eddb05 authored by Joel Granados's avatar Joel Granados
Browse files

uevent: mv uevent_helper into kobject_uevent.c 



Move both uevent_helper table into lib/kobject_uevent.c. Place the
registration early in the initcall order with postcore_initcall.

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.

Signed-off-by: default avatarJoel Granados <joel.granados@kernel.org>
parent 39dac316

kernel/sysctl.c

+0 −9
Original line number Diff line number Diff line
@@ -1474,15 +1474,6 @@ static const struct ctl_table kern_table[] = { 
		.mode		= 0644,

		.proc_handler	= proc_dointvec,

	},

#endif

#ifdef CONFIG_UEVENT_HELPER

	{

		.procname	= "hotplug",

		.data		= &uevent_helper,

		.maxlen		= UEVENT_HELPER_PATH_LEN,

		.mode		= 0644,

		.proc_handler	= proc_dostring,

	},

#endif

	{

		.procname	= "overflowuid",

lib/kobject_uevent.c

+20 −0
Original line number Diff line number Diff line
@@ -826,3 +826,23 @@ static int __init kobject_uevent_init(void) 


postcore_initcall(kobject_uevent_init);

#endif



#ifdef CONFIG_UEVENT_HELPER

static const struct ctl_table uevent_helper_sysctl_table[] = {

	{

		.procname	= "hotplug",

		.data		= &uevent_helper,

		.maxlen		= UEVENT_HELPER_PATH_LEN,

		.mode		= 0644,

		.proc_handler	= proc_dostring,

	},

};



static int __init init_uevent_helper_sysctl(void)

{

	register_sysctl_init("kernel", uevent_helper_sysctl_table);

	return 0;

}



postcore_initcall(init_uevent_helper_sysctl);

#endif