commit 531a6a941745e1e045dd2a6bd09e1dc01247a5f3
author Nicolas Pitre <nicolas.pitre@linaro.org> Mon Oct 24 13:30:32 2011 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Mon Oct 24 20:53:50 2011 +0100
tree d90e1ee69a00f649488e5599325e2dc89d7e345c
parent 34471a9168c8bfd7f0d00989a7b0797ad27d585e

ARM: 7139/1: fix compilation with CONFIG_ARM_ATAG_DTB_COMPAT and large TEXT_OFFSET

If TEXT_OFFSET is too large (e.g. like on MSM) the resulting immediate
argument gets wider than 8 bits.

Noticed by David Brown <davidb@codeaurora.org>

Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

arch/arm/boot/compressed/head.S

diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
index 9f5ac11..c2effc9 100644
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
@@ -269,7 +269,8 @@
 		 * of RAM and hope for the best.
 		 */
 		cmp	r0, #1
-		sub	r0, r4, #(TEXT_OFFSET - 0x100)
+		sub	r0, r4, #TEXT_OFFSET
+		add	r0, r0, #0x100
 		mov	r1, r6
 		sub	r2, sp, r6
 		blne	atags_to_fdt