diff options
| author |   Stefan Agner <stefan@agner.ch> | 2020-03-29 22:33:14 +0200 |
|---|---|---|
| committer |   Tony Lindgren <tony@atomide.com> | 2020-04-21 09:41:53 -0700 |
| commit | d85d5247885ef2e8192287b895c2e381fa931b0b (patch) | |
| tree | 5518a1afc06baf0944bc4d0e3084e4328466dbd2 | |
| parent | Linux 5.7-rc1 (diff) | |
| download | linux-dev-d85d5247885ef2e8192287b895c2e381fa931b0b.tar.xz linux-dev-d85d5247885ef2e8192287b895c2e381fa931b0b.zip | |
ARM: OMAP2+: drop unnecessary adrl
The adrl instruction has been introduced with commit dd31394779aa ("ARM:
omap3: Thumb-2 compatibility for sleep34xx.S"), back when this assembly
file was considerably longer. Today adr seems to have enough reach, even
when inserting about 60 instructions between the use site and the label.
Replace adrl with conventional adr instruction.
This allows to build this file using Clang's integrated assembler (which
does not support the adrl pseudo instruction).
Link: https://github.com/ClangBuiltLinux/linux/issues/430
Signed-off-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Tony Lindgren <tony@atomide.com>
| -rw-r--r-- | arch/arm/mach-omap2/sleep34xx.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/sleep34xx.S b/arch/arm/mach-omap2/sleep34xx.S index ac1324c6453b..c4e97d35c310 100644 --- a/arch/arm/mach-omap2/sleep34xx.S +++ b/arch/arm/mach-omap2/sleep34xx.S @@ -72,7 +72,7 @@ ENTRY(enable_omap3630_toggle_l2_on_restore) stmfd sp!, {lr} @ save registers on stack /* Setup so that we will disable and enable l2 */ mov r1, #0x1 - adrl r3, l2dis_3630_offset @ may be too distant for plain adr + adr r3, l2dis_3630_offset ldr r2, [r3] @ value for offset str r1, [r2, r3] @ write to l2dis_3630 ldmfd sp!, {pc} @ restore regs and return |