From 5307427a31c50041cc4d18c49e9cce1a9303ea04 Mon Sep 17 00:00:00 2001 From: "Srivatsa S. Bhat" Date: Tue, 15 Nov 2011 21:59:21 +0100 Subject: PM / Usermodehelper: Cleanup remnants of usermodehelper_pm_callback() usermodehelper_pm_callback() no longer exists in the kernel. There are 2 comments in kernel/kmod.c that still refer to it. Also, the patch that introduced usermodehelper_pm_callback(), #included two header files: and . But these are no longer necessary. This patch updates the comments as appropriate and removes the unnecessary header file inclusions. Signed-off-by: Srivatsa S. Bhat Signed-off-by: Rafael J. Wysocki --- kernel/kmod.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'kernel/kmod.c') 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 @@ #include #include #include -#include -#include #include #include @@ -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) -- cgit v1.2.3-59-g8ed1b