projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' into for-linus
[cascardo/linux.git]
/
arch
/
arm
/
kernel
/
head.S
diff --git
a/arch/arm/kernel/head.S
b/arch/arm/kernel/head.S
index
566c54c
..
08c82fd
100644
(file)
--- a/
arch/arm/kernel/head.S
+++ b/
arch/arm/kernel/head.S
@@
-360,7
+360,7
@@
__secondary_data:
* r13 = *virtual* address to jump to upon completion
*/
__enable_mmu:
-#if
def CONFIG_ALIGNMENT_TRAP
+#if
defined(CONFIG_ALIGNMENT_TRAP) && __LINUX_ARM_ARCH__ < 6
orr r0, r0, #CR_A
#else
bic r0, r0, #CR_A