Commit 3e68001b authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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()
parents 4962516b d7268a31

kernel/cpu.c

+2 −2
Original line number Diff line number Diff line
@@ -470,7 +470,7 @@ void __ref enable_nonboot_cpus(void) 
	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))

		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);

	return 0;

kernel/kmod.c

+2 −4
Original line number Diff line number Diff line
@@ -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)