diff --git a/[refs] b/[refs] index a7b3d8b201ce..5619d0189154 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d3c7b77d1a6e7a0a27035a7ba723a3455317883e +refs/heads/master: 3f5e06f8799adca3e7e1bbafe1cd780a3e69f604 diff --git a/trunk/arch/ia64/kvm/kvm-ia64.c b/trunk/arch/ia64/kvm/kvm-ia64.c index d20a5db4c4dd..774f0d78a581 100644 --- a/trunk/arch/ia64/kvm/kvm-ia64.c +++ b/trunk/arch/ia64/kvm/kvm-ia64.c @@ -1837,7 +1837,7 @@ int kvm_apic_match_logical_addr(struct kvm_lapic *apic, u8 mda) } struct kvm_vcpu *kvm_get_lowest_prio_vcpu(struct kvm *kvm, u8 vector, - unsigned long bitmap) + unsigned long *bitmap) { struct kvm_vcpu *lvcpu = kvm->vcpus[0]; int i;