---

yaml --- r: 339519 b: refs/heads/master c: 76e0920 h: refs/heads/master i: 339517: 8eb2307 339515: 6f0bded 339511: 41e71b7 339503: 583416a 339487: a2816f7 339455: 05e8cd9 v: v3
git-mirror · Dec 7, 2012 · 63dcdaf · 63dcdaf
1 parent ff30f01
commit 63dcdaf
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: 2148b93ac86665ee70aea684bac003b3deb31dde
+refs/heads/master: 76e0920403d3de1a9ed39cffc3ec9fcb00fa4bc9
diff --git 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