From: Marc Zyngier <marc.zyng...@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.paol...@virtualopensystems.com> Cc: Paolo Bonzini <pbonz...@redhat.com> Cc: Christoffer Dall <christoffer.d...@linaro.org> Signed-off-by: Marc Zyngier <marc.zyng...@arm.com> Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> Signed-off-by: Shannon Zhao <shannon.z...@linaro.org> Signed-off-by: Jiri Slaby <jsl...@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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/