diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2011-12-25 23:41:23 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2011-12-25 23:41:23 +0100 |
| commit | 3e68001bb172304615b758d671d8a890fff912d9 (patch) | |
| tree | 02d50dfaf6de6f8edb016a8d922b40762634cc05 /kernel | |
| parent | 4962516b2309d76964f9df0d33e74f43b624a42d (diff) | |
| parent | d7268a31c8aabc5a29ccc7f76de84383e5f38737 (diff) | |
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()
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/cpu.c | 4 | ||||
| -rw-r--r-- | kernel/kmod.c | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/kernel/cpu.c b/kernel/cpu.c index 563f13609470..cf915b86a5fb 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -470,7 +470,7 @@ out: 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; 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 <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) |