diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
index f379b0411fc..2f8bf620dcd 100644
--- a/arch/arm/kernel/head.S
+++ b/arch/arm/kernel/head.S
@@ -348,8 +348,8 @@ __secondary_data:
  *  r13 = *virtual* address to jump to upon completion
  */
 __enable_mmu:
-#ifdef CONFIG_ALIGNMENT_TRAP
-	orr	r0, r0, #CR_A
+#if defined(CONFIG_ALIGNMENT_TRAP) && __LINUX_ARM_ARCH__ < 6
+      orr     r0, r0, #CR_A
 #else
 	bic	r0, r0, #CR_A
 #endif