diff options
| author | Michael Marineau <mike@marineau.org> | 2014-04-10 14:09:31 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-25 12:00:49 -0700 |
| commit | 86d56134f1b67d0c18025ba5cade95c048ed528d (patch) | |
| tree | caa4346965954ded259784e3b68af159e3161aeb /kernel/sysctl.c | |
| parent | d911d98748018f7c8facc035ba39c30f5cce6f9c (diff) | |
| download | blackbird-op-linux-86d56134f1b67d0c18025ba5cade95c048ed528d.tar.gz blackbird-op-linux-86d56134f1b67d0c18025ba5cade95c048ed528d.zip | |
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.c | 4 |
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[] = { .extra2 = &one, }, #endif - +#ifdef CONFIG_UEVENT_HELPER { .procname = "hotplug", .data = &uevent_helper, @@ -651,7 +651,7 @@ static struct ctl_table kern_table[] = { .mode = 0644, .proc_handler = proc_dostring, }, - +#endif #ifdef CONFIG_CHR_DEV_SG { .procname = "sg-big-buff", |
