This commit was manufactured by cvs2svn to create branch 'vserver'.

[linux-2.6.git] / kernel / kmod.c

diff --git a/kernel/kmod.c b/kernel/kmod.c
index ea62192..eed53d4 100644 (file)
--- 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;
@@ -154,7 +131,6 @@ static int ____call_usermodehelper(void *data)
 {
        struct subprocess_info *sub_info = data;
        int retval;
-       cpumask_t mask = CPU_MASK_ALL;
 
        /* Unblock all signals. */
        flush_signals(current);
@@ -165,7 +141,7 @@ static int ____call_usermodehelper(void *data)
        spin_unlock_irq(&current->sighand->siglock);
 
        /* We can run anywhere, unlike our parent keventd(). */
-       set_cpus_allowed(current, mask);
+       set_cpus_allowed(current, CPU_MASK_ALL);
 
        retval = -EPERM;
        if (current->fs->root)
@@ -273,10 +249,8 @@ int call_usermodehelper(char *path, char **argv, char **envp, int wait)
 }
 EXPORT_SYMBOL(call_usermodehelper);
 
-static __init int usermodehelper_init(void)
+void __init usermodehelper_init(void)
 {
        khelper_wq = create_singlethread_workqueue("khelper");
        BUG_ON(!khelper_wq);
-       return 0;
 }
-core_initcall(usermodehelper_init);