aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Konovalov <andrey.konovalov@linaro.org>2015-03-16 20:06:20 +0300
committerAndrey Konovalov <andrey.konovalov@linaro.org>2015-04-02 15:56:54 +0300
commit37b6a6744a21748fc14c5fd9d97dab6480fd2aea (patch)
tree773bd8c2f1b8805c93d54d476ddea777eecbdec9
parent7cd31fb5f8e55108c2c86937c504faf6996e9415 (diff)
Add non-global symbols to avoid build failure in thumb2 mode. Exact the same issue and the fix as in [1]; just the variables are different. [1] http://lists.linaro.org/pipermail/linaro-kernel/2014-June/015227.html Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>
-rw-r--r--arch/arm/mach-exynos/sleep.S6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-exynos/sleep.S b/arch/arm/mach-exynos/sleep.S
index 31d25834b9c4..73f7fde2c19e 100644
--- a/arch/arm/mach-exynos/sleep.S
+++ b/arch/arm/mach-exynos/sleep.S
@@ -69,9 +69,9 @@ ENTRY(exynos_cpu_resume_ns)
cmp r0, r1
bne skip_cp15
- adr r0, cp15_save_power
+ adr r0, .Lcp15_save_power
ldr r1, [r0]
- adr r0, cp15_save_diag
+ adr r0, .Lcp15_save_diag
ldr r2, [r0]
mov r0, #SMC_CMD_C15RESUME
dsb
@@ -118,9 +118,11 @@ skip_l2x0:
skip_cp15:
b cpu_resume
ENDPROC(exynos_cpu_resume_ns)
+.Lcp15_save_diag:
.globl cp15_save_diag
cp15_save_diag:
.long 0 @ cp15 diagnostic
+.Lcp15_save_power:
.globl cp15_save_power
cp15_save_power:
.long 0 @ cp15 power control