commit 1c8ebfea1259ebc3cbf6ff4c6fc669aad087b6fa
author Catalin Marinas <catalin.marinas@arm.com> Mon Nov 07 13:28:23 2011 -0800
committer Rohit Vaswani <rvaswani@codeaurora.org> Tue Nov 08 14:33:39 2011 -0800
tree 658e0b195f4bedec15dcd361f0fabf33b7ac3cbf
parent 9c244d9f9067a029fde8c668a02b0220098bae71

ARM: Allow kernel unaligned accesses on ARMv6+ processors

Recent gcc versions generate unaligned accesses by default on ARMv6 and
later processors. This patch ensures that the SCTLR.A bit is always
cleared on such processors to avoid kernel traping before
alignment_init() is called.

Change-Id: I2666c83b89c476b56387ca1ab3947bf88c4af432
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Rohit Vaswani <rvaswani@codeaurora.org>

arch/arm/kernel/head.S

diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
index f379b04..2f8bf62 100644
--- a/arch/arm/kernel/head.S
+++ b/arch/arm/kernel/head.S
@@ -348,8 +348,8 @@
  *  r13 = *virtual* address to jump to upon completion
  */
 __enable_mmu:
-#ifdef CONFIG_ALIGNMENT_TRAP
-	orr	r0, r0, #CR_A
+#if defined(CONFIG_ALIGNMENT_TRAP) && __LINUX_ARM_ARCH__ < 6
+      orr     r0, r0, #CR_A
 #else
 	bic	r0, r0, #CR_A
 #endif