---

yaml --- r: 275633 b: refs/heads/master c: 8428e84 h: refs/heads/master i: 275631: c1c82ea v: v3
git-mirror · Nov 8, 2011 · 300d43c · 300d43c
1 parent ed7cd59
commit 300d43c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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