[PATCH] use bitmap ops on a bitmap instead of bit ops

[Gleb Natapov <gleb@redhat.com>]

And don't zero bitmap twice. Assume that caller zeros it.
 
Signed-off-by: Gleb Natapov <gleb@redhat.com>
diff --git a/virt/kvm/ioapic.c b/virt/kvm/ioapic.c
index 7c2cb2b..21627b9 100644
--- a/virt/kvm/ioapic.c
+++ b/virt/kvm/ioapic.c
@@ -170,12 +170,11 @@ void kvm_ioapic_get_delivery_bitmask(struct kvm_ioapic *ioapic, u8 dest,
 
 	ioapic_debug("dest %d dest_mode %d\n", dest, dest_mode);
 
-	*mask = 0;
 	if (dest_mode == 0) {	/* Physical mode. */
 		if (dest == 0xFF) {	/* Broadcast. */
 			for (i = 0; i < KVM_MAX_VCPUS; ++i)
 				if (kvm->vcpus[i] && kvm->vcpus[i]->arch.apic)
-					*mask |= 1 << i;
+					__set_bit(i, *mask);
 			return;
 		}
 		for (i = 0; i < KVM_MAX_VCPUS; ++i) {
@@ -184,7 +183,7 @@ void kvm_ioapic_get_delivery_bitmask(struct kvm_ioapic *ioapic, u8 dest,
 				continue;
 			if (kvm_apic_match_physical_addr(vcpu->arch.apic, dest)) {
 				if (vcpu->arch.apic)
-					*mask = 1 << i;
+					__set_bit(i, *mask);
 				break;
 			}
 		}
@@ -195,7 +194,7 @@ void kvm_ioapic_get_delivery_bitmask(struct kvm_ioapic *ioapic, u8 dest,
 				continue;
 			if (vcpu->arch.apic &&
 			    kvm_apic_match_logical_addr(vcpu->arch.apic, dest))
-				*mask |= 1 << vcpu->vcpu_id;
+				__set_bit(i, *mask);
 		}
 	ioapic_debug("mask %x\n", *mask);
 }
--
			Gleb.