ARM: OMAP2+: drop unnecessary adrl

commit d85d524 upstream The adrl instruction has been introduced with commit dd31394 ("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: ClangBuiltLinux/linux#430 Signed-off-by: Stefan Agner <[email protected]> Signed-off-by: Tony Lindgren <[email protected]> Signed-off-by: Florian Fainelli <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> (cherry picked from commit 9e00e5d195ed38bf577101100fa67bf02139623d) Signed-off-by: Sherry Yang <[email protected]>
oracle · Aug 11, 2022 · 9985d78 · 9985d78
1 parent 09b55db
commit 9985d78
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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