Merge branch 'pm-misc' into pm-for-linus
* pm-misc: CPU: Add right qualifiers for alloc_frozen_cpus() and cpu_hotplug_pm_sync_init() PM / Usermodehelper: Cleanup remnants of usermodehelper_pm_callback()
This commit is contained in:
commit
3e68001bb1
|
@ -470,7 +470,7 @@ out:
|
||||||
cpu_maps_update_done();
|
cpu_maps_update_done();
|
||||||
}
|
}
|
||||||
|
|
||||||
static int alloc_frozen_cpus(void)
|
static int __init alloc_frozen_cpus(void)
|
||||||
{
|
{
|
||||||
if (!alloc_cpumask_var(&frozen_cpus, GFP_KERNEL|__GFP_ZERO))
|
if (!alloc_cpumask_var(&frozen_cpus, GFP_KERNEL|__GFP_ZERO))
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
@ -543,7 +543,7 @@ cpu_hotplug_pm_callback(struct notifier_block *nb,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
int cpu_hotplug_pm_sync_init(void)
|
static int __init cpu_hotplug_pm_sync_init(void)
|
||||||
{
|
{
|
||||||
pm_notifier(cpu_hotplug_pm_callback, 0);
|
pm_notifier(cpu_hotplug_pm_callback, 0);
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -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)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue