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
Merge branch 'stable-3.2' into pandora-3.2
[pandora-kernel.git]
/
arch
/
arm
/
kernel
/
entry-header.S
diff --git
a/arch/arm/kernel/entry-header.S
b/arch/arm/kernel/entry-header.S
index
9a8531e
..
5413334
100644
(file)
--- a/
arch/arm/kernel/entry-header.S
+++ b/
arch/arm/kernel/entry-header.S
@@
-37,7
+37,7
@@
.endm
.macro alignment_trap, rtemp
-#if
def CONFIG_ALIGNMENT_TRAP
+#if
defined(CONFIG_ALIGNMENT_TRAP) && __LINUX_ARM_ARCH__ < 7
ldr \rtemp, .LCcralign
ldr \rtemp, [\rtemp]
mcr p15, 0, \rtemp, c1, c0