diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2018-01-21 22:43:43 +1100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2018-01-21 22:43:43 +1100 |
| commit | 5400fc229e6078a6964b15fb98e9a994df3d642a (patch) | |
| tree | eaaed61828654237ace607f45b5ba3aa42ce1160 /arch/powerpc/sysdev | |
| parent | 02ef6dd8109b581343ebeb1c4c973513682535d6 (diff) | |
| parent | 76b03dc07eebe9c8829bc4c40ae357ad04b4b8c1 (diff) | |
| download | linux-stable-5400fc229e6078a6964b15fb98e9a994df3d642a.tar.gz linux-stable-5400fc229e6078a6964b15fb98e9a994df3d642a.tar.bz2 linux-stable-5400fc229e6078a6964b15fb98e9a994df3d642a.zip | |
Merge branch 'topic/ppc-kvm' into next
Merge the topic branch we share with kvm-ppc, this brings in two xive
commits, one from Paul to rework HMI handling, and a minor cleanup to
drop an unused flag.
Diffstat (limited to 'arch/powerpc/sysdev')
| -rw-r--r-- | arch/powerpc/sysdev/xive/common.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/xive/common.c b/arch/powerpc/sysdev/xive/common.c index 838ebdbfe4c5..40c06110821c 100644 --- a/arch/powerpc/sysdev/xive/common.c +++ b/arch/powerpc/sysdev/xive/common.c @@ -367,7 +367,8 @@ static void xive_irq_eoi(struct irq_data *d) * EOI the source if it hasn't been disabled and hasn't * been passed-through to a KVM guest */ - if (!irqd_irq_disabled(d) && !irqd_is_forwarded_to_vcpu(d)) + if (!irqd_irq_disabled(d) && !irqd_is_forwarded_to_vcpu(d) && + !(xd->flags & XIVE_IRQ_NO_EOI)) xive_do_source_eoi(irqd_to_hwirq(d), xd); /* |