diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2004-10-31 21:06:49 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <greg@kroah.com> | 2004-10-31 21:06:49 -0800 |
| commit | 6f1780569c67765e1fef8754fc1812714b85e4d0 (patch) | |
| tree | c47aa542f4209b1349131263bc10f222a64d23b5 /kernel | |
| parent | e07d4e6100616189478dda62e0a261760f2cf4ff (diff) | |
| download | history-6f1780569c67765e1fef8754fc1812714b85e4d0.tar.gz | |
[PATCH] take me home, hotplug_path[]
Move hotplug_path[] out of kmod.[ch] to kobject_uevent.[ch] where
it belongs now. At some time in the future we should fix the remaining bad
hotplug calls (no SEQNUM, no netlink uevent):
./drivers/input/input.c (no DEVPATH on some hotplug events!)
./drivers/pnp/pnpbios/core.c
./drivers/s390/crypto/z90main.c
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/cpu.c | 1 | ||||
| -rw-r--r-- | kernel/kmod.c | 23 | ||||
| -rw-r--r-- | kernel/sysctl.c | 2 |
3 files changed, 1 insertions, 25 deletions
diff --git a/kernel/cpu.c b/kernel/cpu.c index 52fdf97749a278..ebaba873ebadc7 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -11,7 +11,6 @@ #include <linux/unistd.h> #include <linux/cpu.h> #include <linux/module.h> -#include <linux/kmod.h> /* for hotplug_path */ #include <linux/kthread.h> #include <linux/stop_machine.h> #include <asm/semaphore.h> diff --git a/kernel/kmod.c b/kernel/kmod.c index 5e7c44a0cbaa41..eed53d4f523057 100644 --- a/kernel/kmod.c +++ b/kernel/kmod.c @@ -115,29 +115,6 @@ int request_module(const char *fmt, ...) EXPORT_SYMBOL(request_module); #endif /* CONFIG_KMOD */ -#ifdef CONFIG_HOTPLUG -/* - hotplug path is set via /proc/sys - invoked by hotplug-aware bus drivers, - with call_usermodehelper - - argv [0] = hotplug_path; - argv [1] = "usb", "scsi", "pci", "network", etc; - ... plus optional type-specific parameters - argv [n] = 0; - - envp [*] = HOME, PATH; optional type-specific parameters - - a hotplug bus should invoke this for device add/remove - events. the command is expected to load drivers when - necessary, and may perform additional system setup. -*/ -char hotplug_path[KMOD_PATH_LEN] = "/sbin/hotplug"; - -EXPORT_SYMBOL(hotplug_path); - -#endif /* CONFIG_HOTPLUG */ - struct subprocess_info { struct completion *complete; char *path; diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 67ffac304262c1..8b40136f15d094 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -394,7 +394,7 @@ static ctl_table kern_table[] = { .ctl_name = KERN_HOTPLUG, .procname = "hotplug", .data = &hotplug_path, - .maxlen = KMOD_PATH_LEN, + .maxlen = HOTPLUG_PATH_LEN, .mode = 0644, .proc_handler = &proc_dostring, .strategy = &sysctl_string, |