projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'mvebu-fixes-3.16-3' of git://git.infradead.org/linux-mvebu into fixes
[cascardo/linux.git]
/
arch
/
arm64
/
kernel
/
head.S
diff --git
a/arch/arm64/kernel/head.S
b/arch/arm64/kernel/head.S
index
a96d3a6
..
a2c1195
100644
(file)
--- a/
arch/arm64/kernel/head.S
+++ b/
arch/arm64/kernel/head.S
@@
-270,8
+270,7
@@
ENDPROC(stext)
*/
ENTRY(el2_setup)
mrs x0, CurrentEL
- cmp x0, #PSR_MODE_EL2t
- ccmp x0, #PSR_MODE_EL2h, #0x4, ne
+ cmp x0, #CurrentEL_EL2
b.ne 1f
mrs x0, sctlr_el2
CPU_BE( orr x0, x0, #(1 << 25) ) // Set the EE bit for EL2