diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-23 01:09:11 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-23 01:09:11 +0200 |
commit | e2577d229374efc49f6479f42a54c3bd44a6008d (patch) | |
tree | 00429dfc4b9ffa4988dbe959e95bc4edcee3a9c4 /arch/mips/pci/fixup-lemote2f.c | |
parent | Merge tag 'iommu-fixes-v4.14-rc1' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
parent | PCI: endpoint: Use correct "end of test" interrupt (diff) | |
download | linux-e2577d229374efc49f6479f42a54c3bd44a6008d.tar.xz 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/fixup-lemote2f.c')
-rw-r--r-- | arch/mips/pci/fixup-lemote2f.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/pci/fixup-lemote2f.c b/arch/mips/pci/fixup-lemote2f.c index 7e5991e0e323..20cdfdc08938 100644 --- a/arch/mips/pci/fixup-lemote2f.c +++ b/arch/mips/pci/fixup-lemote2f.c @@ -30,7 +30,7 @@ #define PCID 7 /* all the pci device has the PCIA pin, check the datasheet. */ -static char irq_tab[][5] __initdata = { +static char irq_tab[][5] = { /* INTA INTB INTC INTD */ {0, 0, 0, 0, 0}, /* 11: Unused */ {0, 0, 0, 0, 0}, /* 12: Unused */ |