ARM: Exynos: Fix build error with thumb2

Message ID 55071523.7060309@linaro.org
State New
Headers show

Commit Message

Andrey Konovalov March 16, 2015, 5:38 p.m.
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>
---
  arch/arm/mach-exynos/sleep.S | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/arch/arm/mach-exynos/sleep.S b/arch/arm/mach-exynos/sleep.S
index 31d2583..73f7fde 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