From 300d43c24a5ccd974a927e737ebbd408ef5c04fe Mon Sep 17 00:00:00 2001
From: Catalin Marinas <catalin.marinas@arm.com>
Date: Mon, 7 Nov 2011 18:05:53 +0100
Subject: [PATCH] --- yaml --- r: 275633 b: refs/heads/master c:
 8428e84d42179c2a00f5f6450866e70d802d1d05 h: refs/heads/master i:   275631:
 c1c82ea3bbb867c5d9055e83c1dade3c1a6ec109 v: v3

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

diff --git a/[refs] b/[refs]
index c33a43f6f05e..777406cfcd02 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 71e63e748ee6f4bad482b8021386eeb74f6e47f1
+refs/heads/master: 8428e84d42179c2a00f5f6450866e70d802d1d05
diff --git a/trunk/arch/arm/kernel/head.S b/trunk/arch/arm/kernel/head.S
index 566c54c2a1fe..08c82fd844a8 100644
--- a/trunk/arch/arm/kernel/head.S
+++ b/trunk/arch/arm/kernel/head.S
@@ -360,7 +360,7 @@ __secondary_data:
  *  r13 = *virtual* address to jump to upon completion
  */
 __enable_mmu:
-#ifdef CONFIG_ALIGNMENT_TRAP
+#if defined(CONFIG_ALIGNMENT_TRAP) && __LINUX_ARM_ARCH__ < 6
 	orr	r0, r0, #CR_A
 #else
 	bic	r0, r0, #CR_A