X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=arch%2Farm%2Fkernel%2Fentry-common.S;h=1df0380939579379ba66f904a8310639780455f2;hb=f7c3ff94a296f2daf8f5f2e8be3e459636c3fdfd;hp=b2a27b6b0046ee6c1e0f0928c3269ab5f6c63cd2;hpb=aebdd82e18c38258fe84ea080a43c098e826ef63;p=pandora-kernel.git

diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
index b2a27b6b0046..1df038093957 100644
--- a/arch/arm/kernel/entry-common.S
+++ b/arch/arm/kernel/entry-common.S
@@ -405,7 +405,7 @@ ENTRY(vector_swi)
 
 #endif
 
-#ifdef CONFIG_ALIGNMENT_TRAP
+#if defined(CONFIG_ALIGNMENT_TRAP) && __LINUX_ARM_ARCH__ < 7
 	ldr	ip, __cr_alignment
 	ldr	ip, [ip]
 	mcr	p15, 0, ip, c1, c0		@ update control register
@@ -485,7 +485,7 @@ __sys_trace_return:
 	b	ret_slow_syscall
 
 	.align	5
-#ifdef CONFIG_ALIGNMENT_TRAP
+#if defined(CONFIG_ALIGNMENT_TRAP) && __LINUX_ARM_ARCH__ < 7
 	.type	__cr_alignment, #object
 __cr_alignment:
 	.word	cr_alignment