On 17/10/2018 19:05, Sebastian Andrzej Siewior wrote:
> 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@xxxxxxxxxx>
> Cc: "Radim Krčmář" <rkrcmar@xxxxxxxxxx>
> Cc: kvm@xxxxxxxxxxxxxxx
> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx>
> ---
> virt/kvm/eventfd.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c
> index b20b751286fc6..d15a51622d53e 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)
>
> 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
> @@ -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;
>
Acked-by: Paolo Bonzini <pbonzini@xxxxxxxxxx>
