1 From 0d12debe917269a013f8eddd42da8d3de5e3174e Mon Sep 17 00:00:00 2001
2 From: Steve Sakoman <steve@sakoman.com>
3 Date: Thu, 24 Jan 2013 15:42:01 -0800
4 Subject: [PATCH] arm: fix builds with gcc 4.7
6 new unaligned access support in GCC was triggering an alignment fault at boot
7 ---
8 arch/arm/kernel/head.S | 2 +-
9 1 file changed, 1 insertion(+), 1 deletion(-)
11 diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
12 index 6bd82d2..56b02cd 100644
13 --- a/arch/arm/kernel/head.S
14 +++ b/arch/arm/kernel/head.S
15 @@ -336,7 +336,7 @@ __secondary_data:
16 * r13 = *virtual* address to jump to upon completion
17 */
18 __enable_mmu:
19 -#ifdef CONFIG_ALIGNMENT_TRAP
20 +#if defined(CONFIG_ALIGNMENT_TRAP) && __LINUX_ARM_ARCH__ < 6
21 orr r0, r0, #CR_A
22 #else
23 bic r0, r0, #CR_A
24 --
25 1.8.1.2