|
@@ -34,8 +34,6 @@
|
|
#include <linux/kernel.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/init.h>
|
|
#include <linux/init.h>
|
|
#include <linux/resource.h>
|
|
#include <linux/resource.h>
|
|
-#include <linux/notifier.h>
|
|
|
|
-#include <linux/suspend.h>
|
|
|
|
#include <asm/uaccess.h>
|
|
#include <asm/uaccess.h>
|
|
|
|
|
|
#include <trace/events/module.h>
|
|
#include <trace/events/module.h>
|
|
@@ -282,14 +280,14 @@ static int usermodehelper_disabled = 1;
|
|
static atomic_t running_helpers = ATOMIC_INIT(0);
|
|
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.
|
|
* helpers to finish.
|
|
*/
|
|
*/
|
|
static DECLARE_WAIT_QUEUE_HEAD(running_helpers_waitq);
|
|
static DECLARE_WAIT_QUEUE_HEAD(running_helpers_waitq);
|
|
|
|
|
|
/*
|
|
/*
|
|
* Time to wait for running_helpers to become zero before the setting of
|
|
* 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)
|
|
#define RUNNING_HELPERS_TIMEOUT (5 * HZ)
|
|
|
|
|