projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
[linux-2.6-block.git]
/
arch
/
x86
/
kvm
/
vmx
/
vmx.c
diff --git
a/arch/x86/kvm/vmx/vmx.c
b/arch/x86/kvm/vmx/vmx.c
index 73bf9a2e6fb6aa044651a4528b8b129158537bd3..4a99be1fae4e58193116d5e08a98ef42a4debd2b 100644
(file)
--- a/
arch/x86/kvm/vmx/vmx.c
+++ b/
arch/x86/kvm/vmx/vmx.c
@@
-7798,6
+7798,7
@@
static struct kvm_x86_ops vmx_x86_ops __ro_after_init = {
.set_nested_state = NULL,
.get_vmcs12_pages = NULL,
.nested_enable_evmcs = NULL,
+ .nested_get_evmcs_version = NULL,
.need_emulation_on_page_fault = vmx_need_emulation_on_page_fault,
.apic_init_signal_blocked = vmx_apic_init_signal_blocked,
};