projects
/
platform
/
kernel
/
linux-rpi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'kvm-x86-svm-6.4' of https://github.com/kvm-x86/linux into HEAD
[platform/kernel/linux-rpi.git]
/
arch
/
x86
/
include
/
asm
/
kvm-x86-ops.h
diff --git
a/arch/x86/include/asm/kvm-x86-ops.h
b/arch/x86/include/asm/kvm-x86-ops.h
index
430ca22
..
13bc212
100644
(file)
--- a/
arch/x86/include/asm/kvm-x86-ops.h
+++ b/
arch/x86/include/asm/kvm-x86-ops.h
@@
-68,6
+68,8
@@
KVM_X86_OP(get_interrupt_shadow)
KVM_X86_OP(patch_hypercall)
KVM_X86_OP(inject_irq)
KVM_X86_OP(inject_nmi)
+KVM_X86_OP_OPTIONAL_RET0(is_vnmi_pending)
+KVM_X86_OP_OPTIONAL_RET0(set_vnmi_pending)
KVM_X86_OP(inject_exception)
KVM_X86_OP(cancel_injection)
KVM_X86_OP(interrupt_allowed)