From: Will Deacon <will.deacon@arm.com>
Date: Tue, 26 Aug 2014 14:13:24 +0000 (+0100)
Subject: KVM: vgic: return int instead of bool when checking I/O ranges
X-Git-Tag: v3.16.35~2104
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d718a29b8d436151835945d1fabf5462e51e353f;p=thirdparty%2Fkernel%2Fstable.git

KVM: vgic: return int instead of bool when checking I/O ranges

commit 1fa451bcc67fa921a04c5fac8dbcde7844d54512 upstream.

vgic_ioaddr_overlap claims to return a bool, but in reality it returns
an int. Shut sparse up by fixing the type signature.

Cc: Christoffer Dall <christoffer.dall@linaro.org>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
---

diff --git a/virt/kvm/arm/vgic.c b/virt/kvm/arm/vgic.c
index 476d3bf540a85..98160610fe566 100644
--- a/virt/kvm/arm/vgic.c
+++ b/virt/kvm/arm/vgic.c
@@ -1654,7 +1654,7 @@ out:
 	return ret;
 }
 
-static bool vgic_ioaddr_overlap(struct kvm *kvm)
+static int vgic_ioaddr_overlap(struct kvm *kvm)
 {
 	phys_addr_t dist = kvm->arch.vgic.vgic_dist_base;
 	phys_addr_t cpu = kvm->arch.vgic.vgic_cpu_base;