diff options
Diffstat (limited to 'kernel/kmod.c')
| -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 a4bea97c75b..2142687094d 100644 --- a/kernel/kmod.c +++ b/kernel/kmod.c @@ -34,8 +34,6 @@ #include <linux/kernel.h> #include <linux/init.h> #include <linux/resource.h> -#include <linux/notifier.h> -#include <linux/suspend.h> #include <asm/uaccess.h> #include <trace/events/module.h> @@ -282,14 +280,14 @@ static int usermodehelper_disabled = 1; static atomic_t running_helpers = ATOMIC_INIT(0); /* - * Wait queue head used by usermodehelper_pm_callback() to wait for all running + * Wait queue head used by usermodehelper_disable() to wait for all running * helpers to finish. */ static DECLARE_WAIT_QUEUE_HEAD(running_helpers_waitq); /* * Time to wait for running_helpers to become zero before the setting of - * usermodehelper_disabled in usermodehelper_pm_callback() fails + * usermodehelper_disabled in usermodehelper_disable() fails */ #define RUNNING_HELPERS_TIMEOUT (5 * HZ) |