2 files changed, 2 insertions, 3 deletions

diff --git a/drivers/kvm/kvm.h b/drivers/kvm/kvm.h
index 25439a5968..cec5f057f3 100644
--- a/drivers/kvm/kvm.h
+++ b/drivers/kvm/kvm.h
@@ -324,8 +324,7 @@ struct kvm_vcpu {
         int guest_mode;
         unsigned long requests;
         unsigned long irq_summary; /* bit vector: 1 per word in irq_pending */
-#define NR_IRQ_WORDS KVM_IRQ_BITMAP_SIZE(unsigned long)
-        unsigned long irq_pending[NR_IRQ_WORDS];
+        DECLARE_BITMAP(irq_pending, KVM_NR_INTERRUPTS);
         unsigned long regs[NR_VCPU_REGS]; /* for rsp: vcpu_load_rsp_rip() */
         unsigned long rip;      /* needs vcpu_load_rsp_rip() */
 
diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c
index af02320012..fc63de25d9 100644
--- a/drivers/kvm/kvm_main.c
+++ b/drivers/kvm/kvm_main.c
@@ -2130,7 +2130,7 @@ static int kvm_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu,
         memcpy(vcpu->irq_pending, sregs->interrupt_bitmap,
                sizeof vcpu->irq_pending);
         vcpu->irq_summary = 0;
-        for (i = 0; i < NR_IRQ_WORDS; ++i)
+        for (i = 0; i < ARRAY_SIZE(vcpu->irq_pending); ++i)
                 if (vcpu->irq_pending[i])
                         __set_bit(i, &vcpu->irq_summary);