--- arch/arm/kernel/head.S

+++ arch/arm/kernel/head.S

@@ -348,10 +348,10 @@ __secondary_data:

* r13 = *virtual* address to jump to upon completion

*/

__enable_mmu:

-#if defined(CONFIG_ALIGNMENT_TRAP) && __LINUX_ARM_ARCH__ < 6

- orr r0, r0, #CR_A

-#else

+#ifdef CONFIG_ALLOW_CPU_ALIGNMENT

bic r0, r0, #CR_A

+#else

+ orr r0, r0, #CR_A

#endif

#ifdef CONFIG_CPU_DCACHE_DISABLE

bic r0, r0, #CR_C