diff options
author | Russell King <rmk+kernel@armlinux.org.uk> | 2019-01-25 23:10:15 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-02-20 12:13:19 +0300 |
commit | fd9d0553fba3d24fc3ba14012489de148a368e3b (patch) | |
tree | 5bdcee4e7601c017732c56c9531b2bb5d14ad261 /arch/arm | |
parent | dfb3536268fc22706ff33d127557f78033b5b1cd (diff) | |
download | linux-fd9d0553fba3d24fc3ba14012489de148a368e3b.tar.xz |
ARM: iop32x/n2100: fix PCI IRQ mapping
commit db4090920ba2d61a5827a23e441447926a02ffee upstream.
Booting 4.20 on a TheCUS N2100 results in a kernel oops while probing
PCI, due to n2100_pci_map_irq() having been discarded during boot.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Cc: stable@vger.kernel.org # 2.6.18+
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-iop32x/n2100.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-iop32x/n2100.c b/arch/arm/mach-iop32x/n2100.c index c1cd80ecc219..a904244264ce 100644 --- a/arch/arm/mach-iop32x/n2100.c +++ b/arch/arm/mach-iop32x/n2100.c @@ -75,8 +75,7 @@ void __init n2100_map_io(void) /* * N2100 PCI. */ -static int __init -n2100_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) +static int n2100_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) { int irq; |