UPDATES: add support for cpu alignment, fix makefile, make changes to f/sync
/arch/arm/kernel/head-nommu.S
blob:6b1e0ad9ec3b7494d8b3474dca0a88256c836959 -> blob:fdae174eac2b1043a65b8f3bb08601031c2310dc
--- arch/arm/kernel/head-nommu.S
+++ arch/arm/kernel/head-nommu.S
@@ -60,10 +60,10 @@ __after_proc_init:
* CP15 system control register value returned in r0 from
* the CPU init function.
*/
-#ifdef CONFIG_ALIGNMENT_TRAP
- 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