|author||Russell King <firstname.lastname@example.org>||2015-06-12 21:19:35 +0100|
|committer||Russell King <email@example.com>||2015-06-12 21:19:35 +0100|
ARM: fix new BSYM() usage introduced via for-arm-soc branch
Commit 32e55a777f83 ("ARM: 8389/1: Add cpu_resume_arm() for firmwares that resume in ARM state") needed to introduce a new usage of BSYM() to fix a problem with a previous patch. This in turn causes a conflict with the "bsym" branch which removes this symbol, replacing it with a 'badr' assembly macro. Fix this up. Signed-off-by: Russell King <firstname.lastname@example.org>
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/sleep.S b/arch/arm/kernel/sleep.S
index c5e1e21a294f..0f6c1000582c 100644
@@ -122,7 +122,7 @@ ENDPROC(cpu_resume_after_mmu)
- THUMB( adr r9, BSYM(1f) ) @ Kernel is entered in ARM.
+ THUMB( badr r9, 1f ) @ Kernel is entered in ARM.
THUMB( bx r9 ) @ If this is a Thumb-2 kernel,
THUMB( .thumb ) @ switch to Thumb now.