diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-26 10:58:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-26 10:58:49 -0700 |
| commit | 749f04615a3d435e98a13cc1e38be10774e1c64b (patch) | |
| tree | 5e4dcb499fd9e8e19fb94aad5b4b822ee58125ec /arch/s390/pci/pci_irq.c | |
| parent | 670bcd79b5237deaf1518cfc90d5058b52ea5ac8 (diff) | |
| parent | 673deb0beba5d39c2e0bc6536e00b03b6ef59cc0 (diff) | |
| download | linux-749f04615a3d435e98a13cc1e38be10774e1c64b.tar.gz linux-749f04615a3d435e98a13cc1e38be10774e1c64b.tar.bz2 linux-749f04615a3d435e98a13cc1e38be10774e1c64b.zip | |
Merge tag 's390-5.7-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Vasily Gorbik:
- Add a few notrace annotations to avoid potential crashes when
switching ftrace tracers.
- Avoid setting affinity for floating irqs in pci code.
- Fix build issue found by kbuild test robot.
* tag 's390-5.7-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/protvirt: fix compilation issue
s390/pci: do not set affinity for floating irqs
s390/ftrace: fix potential crashes when switching tracers
Diffstat (limited to 'arch/s390/pci/pci_irq.c')
| -rw-r--r-- | arch/s390/pci/pci_irq.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/s390/pci/pci_irq.c b/arch/s390/pci/pci_irq.c index fbe97ab2e228..743f257cf2cb 100644 --- a/arch/s390/pci/pci_irq.c +++ b/arch/s390/pci/pci_irq.c @@ -115,7 +115,6 @@ static struct irq_chip zpci_irq_chip = { .name = "PCI-MSI", .irq_unmask = pci_msi_unmask_irq, .irq_mask = pci_msi_mask_irq, - .irq_set_affinity = zpci_set_irq_affinity, }; static void zpci_handle_cpu_local_irq(bool rescan) @@ -276,7 +275,9 @@ int arch_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type) rc = -EIO; if (hwirq - bit >= msi_vecs) break; - irq = __irq_alloc_descs(-1, 0, 1, 0, THIS_MODULE, msi->affinity); + irq = __irq_alloc_descs(-1, 0, 1, 0, THIS_MODULE, + (irq_delivery == DIRECTED) ? + msi->affinity : NULL); if (irq < 0) return -ENOMEM; rc = irq_set_msi_desc(irq, msi); |