diff options
| author | David S. Miller <davem@davemloft.net> | 2019-05-31 20:49:43 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-05-31 20:49:43 +0300 |
| commit | b4b12b0d2f02613101a7a667ef7b7cc8d388e597 (patch) | |
| tree | ae2d52198929797821961fd0b5923b5ea1a89fe1 /virt/kvm/eventfd.c | |
| parent | c9bb6165a16e6d5498981a6c777b94a78e74462b (diff) | |
| parent | 036e34310931e64ce4f1edead435708cd517db10 (diff) | |
| download | linux-b4b12b0d2f02613101a7a667ef7b7cc8d388e597.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The phylink conflict was between a bug fix by Russell King
to make sure we have a consistent PHY interface mode, and
a change in net-next to pull some code in phylink_resolve()
into the helper functions phylink_mac_link_{up,down}()
On the dp83867 side it's mostly overlapping changes, with
the 'net' side removing a condition that was supposed to
trigger for RGMII but because of how it was coded never
actually could trigger.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'virt/kvm/eventfd.c')
| -rw-r--r-- | virt/kvm/eventfd.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c index 001aeda4c154..3972a9564c76 100644 --- a/virt/kvm/eventfd.c +++ b/virt/kvm/eventfd.c @@ -44,6 +44,12 @@ static struct workqueue_struct *irqfd_cleanup_wq; +bool __attribute__((weak)) +kvm_arch_irqfd_allowed(struct kvm *kvm, struct kvm_irqfd *args) +{ + return true; +} + static void irqfd_inject(struct work_struct *work) { @@ -297,6 +303,9 @@ kvm_irqfd_assign(struct kvm *kvm, struct kvm_irqfd *args) if (!kvm_arch_intc_initialized(kvm)) return -EAGAIN; + if (!kvm_arch_irqfd_allowed(kvm, args)) + return -EINVAL; + irqfd = kzalloc(sizeof(*irqfd), GFP_KERNEL_ACCOUNT); if (!irqfd) return -ENOMEM; |