diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-22 13:09:11 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-22 13:09:11 -1000 |
| commit | e2577d229374efc49f6479f42a54c3bd44a6008d (patch) | |
| tree | 00429dfc4b9ffa4988dbe959e95bc4edcee3a9c4 /arch/mips/pci/pci-octeon.c | |
| parent | 9ae0b37e69ca7143cb338f183ce326442c8dd8be (diff) | |
| parent | 749aaf3372b8b56b8743c3e27700d64c8bd06921 (diff) | |
| download | linux-e2577d229374efc49f6479f42a54c3bd44a6008d.tar.gz linux-e2577d229374efc49f6479f42a54c3bd44a6008d.tar.bz2 linux-e2577d229374efc49f6479f42a54c3bd44a6008d.zip | |
Merge tag 'pci-v4.14-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fixes from Bjorn Helgaas:
- fix endpoint "end of test" interrupt issue (introduced in v4.14-rc1)
(John Keeping)
- fix MIPS use-after-free map_irq() issue (introduced in v4.14-rc1)
(Lorenzo Pieralisi)
* tag 'pci-v4.14-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
PCI: endpoint: Use correct "end of test" interrupt
MIPS: PCI: Move map_irq() hooks out of initdata
Diffstat (limited to 'arch/mips/pci/pci-octeon.c')
| -rw-r--r-- | arch/mips/pci/pci-octeon.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/mips/pci/pci-octeon.c b/arch/mips/pci/pci-octeon.c index 771f5de6362d..3e92a06fa772 100644 --- a/arch/mips/pci/pci-octeon.c +++ b/arch/mips/pci/pci-octeon.c @@ -59,8 +59,7 @@ union octeon_pci_address { } s; }; -int (*octeon_pcibios_map_irq)(const struct pci_dev *dev, - u8 slot, u8 pin); +int (*octeon_pcibios_map_irq)(const struct pci_dev *dev, u8 slot, u8 pin); enum octeon_dma_bar_type octeon_dma_bar_type = OCTEON_DMA_BAR_TYPE_INVALID; /** |