summaryrefslogtreecommitdiffstats
path: root/arch/x86/include
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2015-10-13 21:32:50 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2015-10-13 21:32:50 +0200
commit58f800d5ace99c49e6418cb5757d868f2746acb4 (patch)
tree5e6d8e459f282e35b8b8245a39de838a2c364d42 /arch/x86/include
parent1330a0170a48ad3788eff01aaf889203652ab4c7 (diff)
parent73917739334c6509833b0403b81d4a04a8784bdf (diff)
downloadop-kernel-dev-58f800d5ace99c49e6418cb5757d868f2746acb4.zip
op-kernel-dev-58f800d5ace99c49e6418cb5757d868f2746acb4.tar.gz
Merge branch 'kvm-master' into HEAD
This merge brings in a couple important SMM fixes, which makes it easier to test latest KVM with unrestricted_guest=0 and to test the in-progress work on SMM support in the firmware. Conflicts: arch/x86/kvm/x86.c
Diffstat (limited to 'arch/x86/include')
-rw-r--r--arch/x86/include/asm/kvm_host.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index cdbdb55..53deb27 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -1251,10 +1251,8 @@ void kvm_complete_insn_gp(struct kvm_vcpu *vcpu, int err);
int kvm_is_in_guest(void);
-int __x86_set_memory_region(struct kvm *kvm,
- const struct kvm_userspace_memory_region *mem);
-int x86_set_memory_region(struct kvm *kvm,
- const struct kvm_userspace_memory_region *mem);
+int __x86_set_memory_region(struct kvm *kvm, int id, gpa_t gpa, u32 size);
+int x86_set_memory_region(struct kvm *kvm, int id, gpa_t gpa, u32 size);
bool kvm_vcpu_is_reset_bsp(struct kvm_vcpu *vcpu);
bool kvm_vcpu_is_bsp(struct kvm_vcpu *vcpu);
OpenPOWER on IntegriCloud