diff options
author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2019-03-15 13:58:15 -0400 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-03-28 12:28:59 -0400 |
commit | ca0488aadd014809862428cde896a6a6e8f13e42 (patch) | |
tree | f10260398a3d9963b9554080073512e0b298658f /virt | |
parent | f285c633cb6d68d2bf3a8ad65bee3835aac9886c (diff) |
kvm: don't redefine flags as something else
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>
Diffstat (limited to 'virt')
-rw-r--r-- | virt/kvm/eventfd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c index 4325250afd72..001aeda4c154 100644 --- a/virt/kvm/eventfd.c +++ b/virt/kvm/eventfd.c | |||
@@ -214,9 +214,9 @@ irqfd_wakeup(wait_queue_entry_t *wait, unsigned mode, int sync, void *key) | |||
214 | 214 | ||
215 | if (flags & EPOLLHUP) { | 215 | if (flags & EPOLLHUP) { |
216 | /* The eventfd is closing, detach from KVM */ | 216 | /* The eventfd is closing, detach from KVM */ |
217 | unsigned long flags; | 217 | unsigned long iflags; |
218 | 218 | ||
219 | spin_lock_irqsave(&kvm->irqfds.lock, flags); | 219 | spin_lock_irqsave(&kvm->irqfds.lock, iflags); |
220 | 220 | ||
221 | /* | 221 | /* |
222 | * We must check if someone deactivated the irqfd before | 222 | * We must check if someone deactivated the irqfd before |
@@ -230,7 +230,7 @@ irqfd_wakeup(wait_queue_entry_t *wait, unsigned mode, int sync, void *key) | |||
230 | if (irqfd_is_active(irqfd)) | 230 | if (irqfd_is_active(irqfd)) |
231 | irqfd_deactivate(irqfd); | 231 | irqfd_deactivate(irqfd); |
232 | 232 | ||
233 | spin_unlock_irqrestore(&kvm->irqfds.lock, flags); | 233 | spin_unlock_irqrestore(&kvm->irqfds.lock, iflags); |
234 | } | 234 | } |
235 | 235 | ||
236 | return 0; | 236 | return 0; |