ARM: iop32x/n2100: fix PCI IRQ mapping

Russell King · arndb · commit db4090920ba2 · 2019-01-30T11:34:42.000+01:00
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 &lt;rmk+kernel@armlinux.org.uk&gt;
Cc: stable@vger.kernel.org # 2.6.18+
Signed-off-by: Arnd Bergmann &lt;arnd@arndb.de&gt;
diff --git 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;
 

Original file line number	Diff line number	Diff line change
`@@ -75,8 +75,7 @@ void __init n2100_map_io(void)`
`75`	`75`	`/*`
`76`	`76`	`* N2100 PCI.`
`77`	`77`	`*/`
`78`		`-static int __init`
`79`		`-n2100_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)`
	`78`	`+static int n2100_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)`
`80`	`79`	`{`
`81`	`80`	`int irq;`
`82`	`81`