Commit 720c60e1 authored Jun 09, 2011 by Nicolas Pitre Committed by Russell King Jun 09, 2011

ARM: 6954/1: zImage: fix Thumb2 breakage



Commit af3e4fd3 "ARM: 6859/1: Add writethrough dcache support for
ARM926EJS processor" broke Thumb2 compilation by omitting to maintain
the wide encoding for the added branch instructions which made the
ARM926EJ-S record smaller than expected, breaking the record walk code.

Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Cc: Mark A. Greer <mgreer@mvista.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

parent f506cd48

arch/arm/boot/compressed/head.S

+3 −3

Original line number	Diff line number	Diff line
		@@ -691,9 +691,9 @@ proc_types:

		.word 0x41069260 @ ARM926EJ-S (v5TEJ)
		.word 0xff0ffff0
		b __arm926ejs_mmu_cache_on
		b __armv4_mmu_cache_off
		b __armv5tej_mmu_cache_flush
		W(b) __arm926ejs_mmu_cache_on
		W(b) __armv4_mmu_cache_off
		W(b) __armv5tej_mmu_cache_flush

		.word 0x00007000 @ ARM7 IDs
		.word 0x0000f000