Messages in this thread Patch in this message | | | From | Jiri Slaby <> | Subject | [PATCH 3.12 28/63] ARM: KVM: fix non-VGIC compilation | Date | Thu, 30 Apr 2015 14:11:57 +0200 |
| |
From: Marc Zyngier <marc.zyngier@arm.com>
3.12-stable review patch. If anyone has any objections, please let me know.
===============
commit 6cbde8253a8143ada18ec0d1711230747a7c1934 upstream.
Add a stub for kvm_vgic_addr when compiling without CONFIG_KVM_ARM_VGIC. The usefulness of this configurarion is extremely doubtful, but let's fix it anyway (until we decide that we'll always support a VGIC).
Reported-by: Michele Paolino <m.paolino@virtualopensystems.com> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Christoffer Dall <christoffer.dall@linaro.org> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org> Signed-off-by: Jiri Slaby <jslaby@suse.cz> --- include/kvm/arm_vgic.h | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/include/kvm/arm_vgic.h b/include/kvm/arm_vgic.h index 7e2d15837b02..a15ae2a820b9 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; -- 2.3.5
| |