ARM: 7591/1: nommu: Enable the strict alignment (CR_A) bit only if ARCH < v6
authorArmando Visconti <armando.visconti@st.com>
Tue, 4 Dec 2012 09:34:39 +0000 (10:34 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 7 Dec 2012 11:48:57 +0000 (11:48 +0000)
This patch keeps disabled the strict alignment CP15 bit for
all armv6 and armv7 processor without the mmu. This behaviour
is now same as in the mmu case.

Signed-off-by: Armando Visconti <armando.visconti@st.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/kernel/head-nommu.S

index 278cfc1..2c228a0 100644 (file)
@@ -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