KVM: vgic: declare probe function pointer as const

[deliverable/linux.git] / virt / kvm / arm / vgic.c

diff --git a/virt/kvm/arm/vgic.c b/virt/kvm/arm/vgic.c
index 73eba793b17f5b5f7dfcda31edb9d890b641a070..efe6eee2e7ebefed3654f5e5568747311f518b97 100644 (file)
--- a/virt/kvm/arm/vgic.c
+++ b/virt/kvm/arm/vgic.c
@@ -1557,8 +1557,8 @@ static const struct of_device_id vgic_ids[] = {
 int kvm_vgic_hyp_init(void)
 {
        const struct of_device_id *matched_id;
-       int (*vgic_probe)(struct device_node *,const struct vgic_ops **,
-                         const struct vgic_params **);
+       const int (*vgic_probe)(struct device_node *,const struct vgic_ops **,
+                               const struct vgic_params **);
        struct device_node *vgic_node;
        int ret;
 
@@ -1690,7 +1690,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;