diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-06-12 21:19:35 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-06-12 21:19:35 +0100 |
| commit | 9ce93bdda7b71fd154986d36c0c1ccf0e7338e26 (patch) | |
| tree | 27f58b37f1e0784bcf8e46fb3f66df3c3b74fbc7 /arch/arm/kernel/sleep.S | |
| parent | a9dd3865dd1bd996a7e6af808645b7e566ced009 (diff) | |
| download | talos-obmc-linux-9ce93bdda7b71fd154986d36c0c1ccf0e7338e26.tar.gz talos-obmc-linux-9ce93bdda7b71fd154986d36c0c1ccf0e7338e26.zip | |
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 <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/sleep.S')
| -rw-r--r-- | arch/arm/kernel/sleep.S | 2 |
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 --- a/arch/arm/kernel/sleep.S +++ b/arch/arm/kernel/sleep.S @@ -122,7 +122,7 @@ ENDPROC(cpu_resume_after_mmu) #ifdef CONFIG_MMU .arm ENTRY(cpu_resume_arm) - 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. THUMB(1: ) |
