diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-06-12 10:24:17 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-06-12 22:17:37 +0200 |
| commit | 2678bb9fa137726a0b83dd61a9c1636543066755 (patch) | |
| tree | 373abe7243b3943aa85417925fd2f3c1d8e44c7d | |
| parent | ARM: 8389/1: Add cpu_resume_arm() for firmwares that resume in ARM state (diff) | |
| download | linux-2678bb9fa137726a0b83dd61a9c1636543066755.tar.xz linux-2678bb9fa137726a0b83dd61a9c1636543066755.zip | |
ARM: fix EFM32 build breakage caused by cpu_resume_arm
Fix:
arch/arm/kernel/sleep.S:121: Error: selected processor does not support ARM opcodes
arch/arm/kernel/sleep.S:123: Error: attempt to use an ARM instruction on a Thumb-only processor -- `adr r9,1f+1'
arch/arm/kernel/sleep.S:124: Error: attempt to use an ARM instruction on a Thumb-only processor -- `bx r9'
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/kernel/sleep.S | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/kernel/sleep.S b/arch/arm/kernel/sleep.S index 761c5debfab0..6060dbc7844e 100644 --- a/arch/arm/kernel/sleep.S +++ b/arch/arm/kernel/sleep.S @@ -118,12 +118,16 @@ ENDPROC(cpu_resume_after_mmu) .text .align + +#ifdef CONFIG_MMU .arm ENTRY(cpu_resume_arm) THUMB( adr r9, BSYM(1f) ) @ Kernel is entered in ARM. THUMB( bx r9 ) @ If this is a Thumb-2 kernel, THUMB( .thumb ) @ switch to Thumb now. THUMB(1: ) +#endif + ENTRY(cpu_resume) ARM_BE8(setend be) @ ensure we are in BE mode #ifdef CONFIG_ARM_VIRT_EXT @@ -155,7 +159,10 @@ THUMB( ldmia r0!, {r1, r2, r3} ) THUMB( mov sp, r2 ) THUMB( bx r3 ) ENDPROC(cpu_resume) + +#ifdef CONFIG_MMU ENDPROC(cpu_resume_arm) +#endif .align 2 _sleep_save_sp: |