|
@@ -215,10 +215,9 @@ int kvm_request_irq_source_id(struct kvm *kvm)
|
|
int irq_source_id;
|
|
int irq_source_id;
|
|
|
|
|
|
mutex_lock(&kvm->irq_lock);
|
|
mutex_lock(&kvm->irq_lock);
|
|
- irq_source_id = find_first_zero_bit(bitmap,
|
|
|
|
- sizeof(kvm->arch.irq_sources_bitmap));
|
|
|
|
|
|
+ irq_source_id = find_first_zero_bit(bitmap, BITS_PER_LONG);
|
|
|
|
|
|
- if (irq_source_id >= sizeof(kvm->arch.irq_sources_bitmap)) {
|
|
|
|
|
|
+ if (irq_source_id >= BITS_PER_LONG) {
|
|
printk(KERN_WARNING "kvm: exhaust allocatable IRQ sources!\n");
|
|
printk(KERN_WARNING "kvm: exhaust allocatable IRQ sources!\n");
|
|
irq_source_id = -EFAULT;
|
|
irq_source_id = -EFAULT;
|
|
goto unlock;
|
|
goto unlock;
|
|
@@ -240,7 +239,7 @@ void kvm_free_irq_source_id(struct kvm *kvm, int irq_source_id)
|
|
|
|
|
|
mutex_lock(&kvm->irq_lock);
|
|
mutex_lock(&kvm->irq_lock);
|
|
if (irq_source_id < 0 ||
|
|
if (irq_source_id < 0 ||
|
|
- irq_source_id >= sizeof(kvm->arch.irq_sources_bitmap)) {
|
|
|
|
|
|
+ irq_source_id >= BITS_PER_LONG) {
|
|
printk(KERN_ERR "kvm: IRQ source ID out of range!\n");
|
|
printk(KERN_ERR "kvm: IRQ source ID out of range!\n");
|
|
goto unlock;
|
|
goto unlock;
|
|
}
|
|
}
|