diff options
| author | Lianwei Wang <lianwei.wang@gmail.com> | 2016-06-19 23:52:27 -0700 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-06-28 00:38:55 +0200 |
| commit | ea00f4f4f00cc2bc3b63ad512a4e6df3b20832b9 (patch) | |
| tree | 148dbab1f94bc7dd515c6ddda12f85bae310dd4f /kernel/power/main.c | |
| parent | ca5f2b4c4fb7bb7397317ee2ead83485aa295a3e (diff) | |
| download | linux-ea00f4f4f00cc2bc3b63ad512a4e6df3b20832b9.tar.gz linux-ea00f4f4f00cc2bc3b63ad512a4e6df3b20832b9.tar.bz2 linux-ea00f4f4f00cc2bc3b63ad512a4e6df3b20832b9.zip | |
PM / sleep: make PM notifiers called symmetrically
This makes pm notifier PREPARE/POST symmetrical: if PREPARE
fails, we will only undo what ever happened on PREPARE.
It fixes the unbalanced CPU hotplug enable in CPU PM notifier.
Signed-off-by: Lianwei Wang <lianwei.wang@gmail.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'kernel/power/main.c')
| -rw-r--r-- | kernel/power/main.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/kernel/power/main.c b/kernel/power/main.c index 27946975eff0..5ea50b1b7595 100644 --- a/kernel/power/main.c +++ b/kernel/power/main.c @@ -38,12 +38,19 @@ int unregister_pm_notifier(struct notifier_block *nb) } EXPORT_SYMBOL_GPL(unregister_pm_notifier); -int pm_notifier_call_chain(unsigned long val) +int __pm_notifier_call_chain(unsigned long val, int nr_to_call, int *nr_calls) { - int ret = blocking_notifier_call_chain(&pm_chain_head, val, NULL); + int ret; + + ret = __blocking_notifier_call_chain(&pm_chain_head, val, NULL, + nr_to_call, nr_calls); return notifier_to_errno(ret); } +int pm_notifier_call_chain(unsigned long val) +{ + return __pm_notifier_call_chain(val, -1, NULL); +} /* If set, devices may be suspended and resumed asynchronously. */ int pm_async_enabled = 1; |