projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f285c63
)
kvm: don't redefine flags as something else
author
Sebastian Andrzej Siewior
<
[email protected]
>
Fri, 15 Mar 2019 17:58:15 +0000
(18:58 +0100)
committer
Paolo Bonzini
<
[email protected]
>
Thu, 28 Mar 2019 16:28:59 +0000
(17:28 +0100)
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 <
[email protected]
>
Cc: "Radim Krčmář" <
[email protected]
>
Cc:
[email protected]
Signed-off-by: Sebastian Andrzej Siewior <
[email protected]
>
Signed-off-by: Paolo Bonzini <
[email protected]
>
virt/kvm/eventfd.c
patch
|
blob
|
history
diff --git
a/virt/kvm/eventfd.c
b/virt/kvm/eventfd.c
index 4325250afd728447630a2decb1333965d5fd2cf8..001aeda4c154d4a9ff5b2e9f73cebdc743c2c29b 100644
(file)
--- 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
i
flags;
- spin_lock_irqsave(&kvm->irqfds.lock, flags);
+ spin_lock_irqsave(&kvm->irqfds.lock,
i
flags);
/*
* 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,
i
flags);
}
return 0;