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/fixup-emma2rh.c | |
| parent | 9ae0b37e69ca7143cb338f183ce326442c8dd8be (diff) | |
| parent | 749aaf3372b8b56b8743c3e27700d64c8bd06921 (diff) | |
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/fixup-emma2rh.c')
| -rw-r--r-- | arch/mips/pci/fixup-emma2rh.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/pci/fixup-emma2rh.c b/arch/mips/pci/fixup-emma2rh.c index 4832ac9f118a..c31cb6af1cd0 100644 --- a/arch/mips/pci/fixup-emma2rh.c +++ b/arch/mips/pci/fixup-emma2rh.c @@ -43,7 +43,7 @@ */ #define MAX_SLOT_NUM 10 -static unsigned char irq_map[][5] __initdata = { +static unsigned char irq_map[][5] = { [3] = {0, MARKEINS_PCI_IRQ_INTB, MARKEINS_PCI_IRQ_INTC, MARKEINS_PCI_IRQ_INTD, 0,}, [4] = {0, MARKEINS_PCI_IRQ_INTA, 0, 0, 0,}, |