Commit 9e00e5d1 authored Jun 29, 2022 by Stefan Agner Committed by Greg Kroah-Hartman Jul 02, 2022

ARM: OMAP2+: drop unnecessary adrl

commit d85d5247885ef2e8192287b895c2e381fa931b0b upstream

The adrl instruction has been introduced with commit dd313947 ("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>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 3657432a

arch/arm/mach-omap2/sleep34xx.S

+1 −1

Original line number	Diff line number	Diff line
		@@ -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