X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=blobdiff_plain;f=arch%2Farm%2Fkernel%2Fentry-header.S;h=5413334eae027b183500fb41d7875822d0128dd9;hp=9a8531eadd3da437ccadd6f5b60eac6a16808607;hb=f3209e03263a090ec717d370446e0baf15b21a38;hpb=e710574de10b181c159a67af75af0245de33a4b9

diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S
index 9a8531eadd3d..5413334eae02 100644
--- a/arch/arm/kernel/entry-header.S
+++ b/arch/arm/kernel/entry-header.S
@@ -37,7 +37,7 @@
 	.endm
 
 	.macro	alignment_trap, rtemp
-#ifdef CONFIG_ALIGNMENT_TRAP
+#if defined(CONFIG_ALIGNMENT_TRAP) && __LINUX_ARM_ARCH__ < 7
 	ldr	\rtemp, .LCcralign
 	ldr	\rtemp, [\rtemp]
 	mcr	p15, 0, \rtemp, c1, c0