aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQais Yousef <[email protected]>2020-03-23 13:51:01 +0000
committerThomas Gleixner <[email protected]>2020-03-25 12:59:34 +0100
commite646ac5bb88d9480eeb3b0d31d2e3eed056c2638 (patch)
treed75359cdbf6f1b33ce00412a716a41b12fc1e0ac
parentd720f98604391dab6aa3cb4c1bc005ed1aba4703 (diff)
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 <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Acked-by: Catalin Marinas <[email protected]> Cc: Will Deacon <[email protected]> Link: https://lkml.kernel.org/r/[email protected]
-rw-r--r--arch/arm64/kernel/hibernate.c13
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;