ARM: 7137/1: Fix error upon adding LL debug
authorAfzal Mohammed <afzal@ti.com>
Thu, 20 Oct 2011 18:32:07 +0000 (19:32 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 20 Oct 2011 21:03:57 +0000 (22:03 +0100)
Upon adding new board LL debug support, if the resultant code
addition would not cause PC relative offset of "hexbuf" from
"adr r2, hexbuf" (+2) instruction to be representable in a
shifted 8-bit value (hence indirectly putting higher aligment
requirement on larger offsets), following error occurs,

arch/arm/kernel/debug.S: Assembler messages:
arch/arm/kernel/debug.S:138: Error: invalid constant (428) after fixup

Fix it by bringing "hexbuf" closer so that "adr"
can have the offset.

Signed-off-by: Afzal Mohammed <afzal@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/kernel/debug.S

index bcd66e00bdbeec688363cbd0e2178fcc158fcc8a..0f852d082fcf08aa806e0b03203a90ed7c5caaff 100644 (file)
@@ -151,6 +151,8 @@ printhex:   adr     r2, hexbuf
                b       printascii
 ENDPROC(printhex2)
 
+hexbuf:                .space 16
+
                .ltorg
 
 ENTRY(printascii)
@@ -175,5 +177,3 @@ ENTRY(printch)
                mov     r0, #0
                b       1b
 ENDPROC(printch)
-
-hexbuf:                .space 16