AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

kvm: don't redefine flags as something else

Browse Source 
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>
This commit is contained in:
Sebastian Andrzej Siewior 2019-03-15 18:58:15 +01:00 committed by Paolo Bonzini
parent f285c633cb
commit ca0488aadd
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
virt/kvm/eventfd.c
View File

@ -214,9 +214,9 @@ irqfd_wakeup(wait_queue_entry_t *wait, unsigned mode, int sync, void *key)
if (flags & EPOLLHUP) { if (flags & EPOLLHUP) {
/* The eventfd is closing, detach from KVM */ /* 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 * 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)
if (irqfd_is_active(irqfd)) if (irqfd_is_active(irqfd))
irqfd_deactivate(irqfd); irqfd_deactivate(irqfd);
spin_unlock_irqrestore(&kvm->irqfds.lock, flags); spin_unlock_irqrestore(&kvm->irqfds.lock, iflags);
} }
return 0; return 0;