Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76e09204 authored by Armando Visconti's avatar Armando Visconti Committed by Russell King
Browse files

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: default avatarArmando Visconti <armando.visconti@st.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 2148b93a

arch/arm/kernel/head-nommu.S

+1 −1
Original line number Diff line number Diff line
@@ -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