projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszer...
[linux-2.6-microblaze.git]
/
arch
/
arm64
/
kernel
/
head.S
diff --git
a/arch/arm64/kernel/head.S
b/arch/arm64/kernel/head.S
index
2b6b8b2
..
b085306
100644
(file)
--- a/
arch/arm64/kernel/head.S
+++ b/
arch/arm64/kernel/head.S
@@
-577,6
+577,13
@@
set_hcr:
7:
msr mdcr_el2, x3 // Configure debug traps
+ /* LORegions */
+ mrs x1, id_aa64mmfr1_el1
+ ubfx x0, x1, #ID_AA64MMFR1_LOR_SHIFT, 4
+ cbz x0, 1f
+ msr_s SYS_LORC_EL1, xzr
+1:
+
/* Stage-2 translation */
msr vttbr_el2, xzr