git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: avoid alignment related control reg writeouts
[pandora-kernel.git]
/
arch
/
arm
/
kernel
/
entry-common.S
diff --git
a/arch/arm/kernel/entry-common.S
b/arch/arm/kernel/entry-common.S
index
b2a27b6
..
1df0380
100644
(file)
--- a/
arch/arm/kernel/entry-common.S
+++ b/
arch/arm/kernel/entry-common.S
@@
-405,7
+405,7
@@
ENTRY(vector_swi)
#endif
#endif
-#if
def 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
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
b ret_slow_syscall
.align 5
-#if
def CONFIG_ALIGNMENT_TRAP
+#if
defined(CONFIG_ALIGNMENT_TRAP) && __LINUX_ARM_ARCH__ < 7
.type __cr_alignment, #object
__cr_alignment:
.word cr_alignment
.type __cr_alignment, #object
__cr_alignment:
.word cr_alignment