diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-12 17:27:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-12 17:27:23 -0700 |
| commit | 18f2af2d68815e1c4d5c275ebd030e27ef627582 (patch) | |
| tree | 1f90ead7d8507a52a9d8475ced489e5f79135044 /include | |
| parent | 2f727f50f620f44f25ecb615767dc8611f64c988 (diff) | |
| parent | 596f3142d2b7be307a1652d59e7b93adab918437 (diff) | |
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull KVM fixes from Paolo Bonzini:
"The ARM patch fixes a build breakage with randconfig. The x86 one
fixes Windows guests on AMD processors"
* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
KVM: SVM: fix cr8 intercept window
ARM: KVM: fix non-VGIC compilation
Diffstat (limited to 'include')
| -rw-r--r-- | include/kvm/arm_vgic.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/kvm/arm_vgic.h b/include/kvm/arm_vgic.h index be85127bfed3..f27000f55a83 100644 --- a/include/kvm/arm_vgic.h +++ b/include/kvm/arm_vgic.h @@ -171,6 +171,11 @@ static inline int kvm_vgic_set_addr(struct kvm *kvm, unsigned long type, u64 add return 0; } +static inline int kvm_vgic_addr(struct kvm *kvm, unsigned long type, u64 *addr, bool write) +{ + return -ENXIO; +} + static inline int kvm_vgic_init(struct kvm *kvm) { return 0; |