* [PATCH] ARM: zImage: fix Thumb2 breakage
@ 2011-06-09 3:53 Nicolas Pitre
2011-06-09 9:47 ` Dave Martin
0 siblings, 1 reply; 2+ messages in thread
From: Nicolas Pitre @ 2011-06-09 3:53 UTC (permalink / raw)
To: linux-arm-kernel
Commit af3e4fd37a "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>
---
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
index f9da419..942fad9 100644
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
@@ -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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH] ARM: zImage: fix Thumb2 breakage
2011-06-09 3:53 [PATCH] ARM: zImage: fix Thumb2 breakage Nicolas Pitre
@ 2011-06-09 9:47 ` Dave Martin
0 siblings, 0 replies; 2+ messages in thread
From: Dave Martin @ 2011-06-09 9:47 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Jun 08, 2011 at 11:53:02PM -0400, Nicolas Pitre wrote:
>
> Commit af3e4fd37a "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>
This patch looks right, and works for me.
Acked-by: Dave Martin <dave.martin@linaro.org>
> ---
> diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
> index f9da419..942fad9 100644
> --- a/arch/arm/boot/compressed/head.S
> +++ b/arch/arm/boot/compressed/head.S
> @@ -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
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-06-09 9:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-09 3:53 [PATCH] ARM: zImage: fix Thumb2 breakage Nicolas Pitre
2011-06-09 9:47 ` Dave Martin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).