Skip to content

Commit

Permalink
kvm: don't redefine flags as something else
Browse files Browse the repository at this point in the history
The function irqfd_wakeup() has flags defined as __poll_t and then it
has additional flags which is used for irqflags.

Redefine the inner flags variable as iflags so it does not shadow the
outer flags.

Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: "Radim Krčmář" <rkrcmar@redhat.com>
Cc: kvm@vger.kernel.org
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
  • Loading branch information
Sebastian Andrzej Siewior authored and bonzini committed Mar 28, 2019
1 parent f285c63 commit ca0488a
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions virt/kvm/eventfd.c
Original file line number Diff line number Diff line change
Expand Up @@ -214,9 +214,9 @@ irqfd_wakeup(wait_queue_entry_t *wait, unsigned mode, int sync, void *key)

if (flags & EPOLLHUP) {
/* The eventfd is closing, detach from KVM */
unsigned long flags;
unsigned long iflags;

spin_lock_irqsave(&kvm->irqfds.lock, flags);
spin_lock_irqsave(&kvm->irqfds.lock, iflags);

/*
* We must check if someone deactivated the irqfd before
Expand All @@ -230,7 +230,7 @@ irqfd_wakeup(wait_queue_entry_t *wait, unsigned mode, int sync, void *key)
if (irqfd_is_active(irqfd))
irqfd_deactivate(irqfd);

spin_unlock_irqrestore(&kvm->irqfds.lock, flags);
spin_unlock_irqrestore(&kvm->irqfds.lock, iflags);
}

return 0;
Expand Down

0 comments on commit ca0488a

Please sign in to comment.