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/cpu.c | |
| 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/cpu.c')
| -rw-r--r-- | kernel/cpu.c | 4 |
1 files changed, 2 insertions, 2 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; |