diff options
-rw-r--r-- | kernel/kmod.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/kernel/kmod.c b/kernel/kmod.c index a4bea97c75b6..2142687094d3 100644 --- a/kernel/kmod.c +++ b/kernel/kmod.c | |||
@@ -34,8 +34,6 @@ | |||
34 | #include <linux/kernel.h> | 34 | #include <linux/kernel.h> |
35 | #include <linux/init.h> | 35 | #include <linux/init.h> |
36 | #include <linux/resource.h> | 36 | #include <linux/resource.h> |
37 | #include <linux/notifier.h> | ||
38 | #include <linux/suspend.h> | ||
39 | #include <asm/uaccess.h> | 37 | #include <asm/uaccess.h> |
40 | 38 | ||
41 | #include <trace/events/module.h> | 39 | #include <trace/events/module.h> |
@@ -282,14 +280,14 @@ static int usermodehelper_disabled = 1; | |||
282 | static atomic_t running_helpers = ATOMIC_INIT(0); | 280 | static atomic_t running_helpers = ATOMIC_INIT(0); |
283 | 281 | ||
284 | /* | 282 | /* |
285 | * Wait queue head used by usermodehelper_pm_callback() to wait for all running | 283 | * Wait queue head used by usermodehelper_disable() to wait for all running |
286 | * helpers to finish. | 284 | * helpers to finish. |
287 | */ | 285 | */ |
288 | static DECLARE_WAIT_QUEUE_HEAD(running_helpers_waitq); | 286 | static DECLARE_WAIT_QUEUE_HEAD(running_helpers_waitq); |
289 | 287 | ||
290 | /* | 288 | /* |
291 | * Time to wait for running_helpers to become zero before the setting of | 289 | * Time to wait for running_helpers to become zero before the setting of |
292 | * usermodehelper_disabled in usermodehelper_pm_callback() fails | 290 | * usermodehelper_disabled in usermodehelper_disable() fails |
293 | */ | 291 | */ |
294 | #define RUNNING_HELPERS_TIMEOUT (5 * HZ) | 292 | #define RUNNING_HELPERS_TIMEOUT (5 * HZ) |
295 | 293 | ||