Commit 874d5d3c authored Jan 14, 2011 by Dave Martin Committed by Russell King Jan 14, 2011

ARM: 6623/1: Thumb-2: Fix out-of-range offset for Thumb-2 in proc-v7.S



Commit d30e45ee (ARM: pgtable: switch order of Linux vs hardware page tables)
introduced a pre-increment addressing offset which is out of range for
Thumb-2.  Thumb-2 only permits offsets <256.  So split the intruction in
two for Thumb-2.

Signed-off-by: Dave Martin <dave.martin@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

parent 0adfca6f

arch/arm/mm/proc-v7.S

+3 −1

Original line number	Diff line number	Diff line
		@@ -159,7 +159,9 @@ ENTRY(cpu_v7_set_pte_ext)
		tstne r1, #L_PTE_PRESENT
		moveq r3, #0

		str r3, [r0, #2048]!
		ARM( str r3, [r0, #2048]! )
		THUMB( add r0, r0, #2048 )
		THUMB( str r3, [r0] )
		mcr p15, 0, r0, c7, c10, 1 @ flush_pte
		#endif
		mov pc, lr

Admin message