diff options
| author | Armando Visconti <armando.visconti@st.com> | 2012-12-04 10:34:39 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-12-07 12:48:57 +0100 |
| commit | 76e0920403d3de1a9ed39cffc3ec9fcb00fa4bc9 (patch) | |
| tree | 781de4f773dbcbdfdc66a981d95aabf6c8bd3b17 /arch/arm/kernel | |
| parent | ARM: 7589/1: integrator: pass the lm resource to amba (diff) | |
| download | linux-76e0920403d3de1a9ed39cffc3ec9fcb00fa4bc9.tar.xz linux-76e0920403d3de1a9ed39cffc3ec9fcb00fa4bc9.zip | |
ARM: 7591/1: nommu: Enable the strict alignment (CR_A) bit only if ARCH < v6
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>
Diffstat (limited to 'arch/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/head-nommu.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/head-nommu.S b/arch/arm/kernel/head-nommu.S index 278cfc144f44..2c228a07e58c 100644 --- a/arch/arm/kernel/head-nommu.S +++ b/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 |