summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArd Biesheuvel <ard.biesheuvel@linaro.org>2016-09-05 11:23:17 +0200
committerWill Deacon <will.deacon@arm.com>2016-09-05 11:24:55 +0200
commitdc00247576fdb97211e1959b4dfd2a7893cf9d0b (patch)
tree0d3dfea3a48e8251675da2dae7dfd52cc337b42a
parentarm64: Drop generic xlate_dev_mem_{k,}ptr() (diff)
downloadlinux-dc00247576fdb97211e1959b4dfd2a7893cf9d0b.tar.xz
linux-dc00247576fdb97211e1959b4dfd2a7893cf9d0b.zip
arm64: kernel: re-export _cpu_resume() from sleep.S
Commit b5fe242972ef ("arm64: kernel: fix style issues in sleep.S") changed the linkage of _cpu_resume() to local, even though the symbol is also referenced from hibernate.c. So revert this change. Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Signed-off-by: Will Deacon <will.deacon@arm.com>
-rw-r--r--arch/arm64/kernel/sleep.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/sleep.S b/arch/arm64/kernel/sleep.S
index 0f7e0b2ac64c..b8799e7c79de 100644
--- a/arch/arm64/kernel/sleep.S
+++ b/arch/arm64/kernel/sleep.S
@@ -107,7 +107,7 @@ ENDPROC(cpu_resume)
.ltorg
.popsection
-_cpu_resume:
+ENTRY(_cpu_resume)
mrs x1, mpidr_el1
adr_l x8, mpidr_hash // x8 = struct mpidr_hash virt address