aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSrivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>2011-11-15 21:59:21 +0100
committerRafael J. Wysocki <rjw@sisk.pl>2011-11-23 21:15:09 +0100
commit5307427a31c50041cc4d18c49e9cce1a9303ea04 (patch)
treed7cd91e36dc0e1d0329a1cbc32914e38fc0bb3cf
parentbb58dd5d1ffad6c2d21c69698ba766dad4ae54e6 (diff)
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: <linux/notifier.h> and <linux/suspend.h>. 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 <srivatsa.bhat@linux.vnet.ibm.com> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
-rw-r--r--kernel/kmod.c6
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)