git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'pinctrl-v4.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...
[sfrench/cifs-2.6.git]
/
arch
/
arm64
/
kvm
/
hyp-init.S
diff --git
a/arch/arm64/kvm/hyp-init.S
b/arch/arm64/kvm/hyp-init.S
index ea92251607862db0b33f9ef416ae86e8463b2d03..4576b86a5579ccb227d8533c4b0c4fa5ad22de93 100644
(file)
--- a/
arch/arm64/kvm/hyp-init.S
+++ b/
arch/arm64/kvm/hyp-init.S
@@
-65,6
+65,9
@@
__do_hyp_init:
b.lo __kvm_handle_stub_hvc
phys_to_ttbr x4, x0
b.lo __kvm_handle_stub_hvc
phys_to_ttbr x4, x0
+alternative_if ARM64_HAS_CNP
+ orr x4, x4, #TTBR_CNP_BIT
+alternative_else_nop_endif
msr ttbr0_el2, x4
mrs x4, tcr_el1
msr ttbr0_el2, x4
mrs x4, tcr_el1