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 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
arch
/
arm64
/
kvm
/
hyp.S
diff --git
a/arch/arm64/kvm/hyp.S
b/arch/arm64/kvm/hyp.S
index
7ce9315
..
2726635
100644
(file)
--- a/
arch/arm64/kvm/hyp.S
+++ b/
arch/arm64/kvm/hyp.S
@@
-46,10
+46,6
@@
alternative_if_not ARM64_HAS_VIRT_HOST_EXTN
hvc #0
ldr lr, [sp], #16
ret
-alternative_else
+alternative_else
_nop_endif
b __vhe_hyp_call
- nop
- nop
- nop
-alternative_endif
ENDPROC(__kvm_call_hyp)