From 63dcdaf3bde64094422ae4a714d0f24250e9718f Mon Sep 17 00:00:00 2001
From: Armando Visconti <armando.visconti@st.com>
Date: Tue, 4 Dec 2012 10:34:39 +0100
Subject: [PATCH] --- yaml --- r: 339519 b: refs/heads/master c:
 76e0920403d3de1a9ed39cffc3ec9fcb00fa4bc9 h: refs/heads/master i:   339517:
 8eb2307c8fb95b9ade1c46fac61548c56065cae3   339515:
 6f0bded2b6d13bc3f35a7bf4f93193c0908be33e   339511:
 41e71b71f4d7c2a370c7bee15ac0821983b0530f   339503:
 583416aa03ef5b5ffa8916d0e277fef875243fe7   339487:
 a2816f73a1b485438f271a351ece13d6f7aed9fb   339455:
 05e8cd9412bdb85ffd57ff78a13899194f70a65e v: v3

---
 [refs]                             | 2 +-
 trunk/arch/arm/kernel/head-nommu.S | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e41897772ad0..bf188f0637a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2148b93ac86665ee70aea684bac003b3deb31dde
+refs/heads/master: 76e0920403d3de1a9ed39cffc3ec9fcb00fa4bc9
diff --git a/trunk/arch/arm/kernel/head-nommu.S b/trunk/arch/arm/kernel/head-nommu.S
index 278cfc144f44..2c228a07e58c 100644
--- a/trunk/arch/arm/kernel/head-nommu.S
+++ b/trunk/arch/arm/kernel/head-nommu.S
@@ -68,7 +68,7 @@ __after_proc_init:
 	 * CP15 system control register value returned in r0 from
 	 * the CPU init function.
 	 */
-#ifdef CONFIG_ALIGNMENT_TRAP
+#if defined(CONFIG_ALIGNMENT_TRAP) && __LINUX_ARM_ARCH__ < 6
 	orr	r0, r0, #CR_A
 #else
 	bic	r0, r0, #CR_A