aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/sysctl.c
diff options
context:
space:
mode:
authorMichael Marineau <mike@marineau.org>2014-04-10 17:09:31 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-04-25 15:00:49 -0400
commit86d56134f1b67d0c18025ba5cade95c048ed528d (patch)
treecaa4346965954ded259784e3b68af159e3161aeb /kernel/sysctl.c
parentd911d98748018f7c8facc035ba39c30f5cce6f9c (diff)
kobject: Make support for uevent_helper optional.
Support for uevent_helper, aka hotplug, is not required on many systems these days but it can still be enabled via sysfs or sysctl. Reported-by: Darren Shepherd <darren.s.shepherd@gmail.com> Signed-off-by: Michael Marineau <mike@marineau.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/sysctl.c')
-rw-r--r--kernel/sysctl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 74f5b580fe34..bc966a8ffc3e 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -643,7 +643,7 @@ static struct ctl_table kern_table[] = {
643 .extra2 = &one, 643 .extra2 = &one,
644 }, 644 },
645#endif 645#endif
646 646#ifdef CONFIG_UEVENT_HELPER
647 { 647 {
648 .procname = "hotplug", 648 .procname = "hotplug",
649 .data = &uevent_helper, 649 .data = &uevent_helper,
@@ -651,7 +651,7 @@ static struct ctl_table kern_table[] = {
651 .mode = 0644, 651 .mode = 0644,
652 .proc_handler = proc_dostring, 652 .proc_handler = proc_dostring,
653 }, 653 },
654 654#endif
655#ifdef CONFIG_CHR_DEV_SG 655#ifdef CONFIG_CHR_DEV_SG
656 { 656 {
657 .procname = "sg-big-buff", 657 .procname = "sg-big-buff",