diff options
| author |   Qais Yousef <qais.yousef@arm.com> | 2020-03-23 13:51:01 +0000 |
|---|---|---|
| committer |   Thomas Gleixner <tglx@linutronix.de> | 2020-03-25 12:59:34 +0100 |
| commit | e646ac5bb88d9480eeb3b0d31d2e3eed056c2638 (patch) | |
| tree | d75359cdbf6f1b33ce00412a716a41b12fc1e0ac /arch/arm64/kernel/hibernate.c | |
| parent | cpu/hotplug: Provide bringup_hibernate_cpu() (diff) | |
| download | linux-dev-e646ac5bb88d9480eeb3b0d31d2e3eed056c2638.tar.xz linux-dev-e646ac5bb88d9480eeb3b0d31d2e3eed056c2638.zip | |
arm64: hibernate: Use bringup_hibernate_cpu()
Use bringup_hibernate_cpu() instead of open coding it.
[ tglx: Split out the core change ]
Signed-off-by: Qais Yousef <qais.yousef@arm.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
Link: https://lkml.kernel.org/r/20200323135110.30522-9-qais.yousef@arm.com
Diffstat (limited to 'arch/arm64/kernel/hibernate.c')
| -rw-r--r-- | arch/arm64/kernel/hibernate.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/arch/arm64/kernel/hibernate.c b/arch/arm64/kernel/hibernate.c index 590963c9c609..5b73e92c99e3 100644 --- a/arch/arm64/kernel/hibernate.c +++ b/arch/arm64/kernel/hibernate.c @@ -166,14 +166,11 @@ int arch_hibernation_header_restore(void *addr) sleep_cpu = -EINVAL; return -EINVAL; } - if (!cpu_online(sleep_cpu)) { - pr_info("Hibernated on a CPU that is offline! Bringing CPU up.\n"); - ret = cpu_up(sleep_cpu); - if (ret) { - pr_err("Failed to bring hibernate-CPU up!\n"); - sleep_cpu = -EINVAL; - return ret; - } + + ret = bringup_hibernate_cpu(sleep_cpu); + if (ret) { + sleep_cpu = -EINVAL; + return ret; } resume_hdr = *hdr; |