diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-04-18 11:55:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-04-18 11:55:31 -0700 |
| commit | f5ce0466dc96326e07b52b8fc170c91bc234beb3 (patch) | |
| tree | 57289971b637dd82d5d551e34cda4399cbe2a7b9 /arch/arm/mach-footbridge/ebsa285-pci.c | |
| parent | c98ff1d013d2d53911c4b3e8ba14c7cd141cf1ed (diff) | |
| parent | d2f7eca60b29006285d57c7035539e33300e89e5 (diff) | |
| download | linux-f5ce0466dc96326e07b52b8fc170c91bc234beb3.tar.gz linux-f5ce0466dc96326e07b52b8fc170c91bc234beb3.tar.bz2 linux-f5ce0466dc96326e07b52b8fc170c91bc234beb3.zip | |
Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm
Pull ARM fixes from Russell King:
- Halve maximum number of CPUs if DEBUG_KMAP_LOCAL is enabled
- Fix conversion for_each_membock() to for_each_mem_range()
- Fix footbridge PCI mapping
- Avoid uprobes hooking on thumb instructions
* tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
ARM: 9071/1: uprobes: Don't hook on thumb instructions
ARM: footbridge: fix PCI interrupt mapping
ARM: 9069/1: NOMMU: Fix conversion for_each_membock() to for_each_mem_range()
ARM: 9063/1: mm: reduce maximum number of CPUs if DEBUG_KMAP_LOCAL is enabled
Diffstat (limited to 'arch/arm/mach-footbridge/ebsa285-pci.c')
| -rw-r--r-- | arch/arm/mach-footbridge/ebsa285-pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-footbridge/ebsa285-pci.c b/arch/arm/mach-footbridge/ebsa285-pci.c index 6f28aaa9ca79..c3f280d08fa7 100644 --- a/arch/arm/mach-footbridge/ebsa285-pci.c +++ b/arch/arm/mach-footbridge/ebsa285-pci.c @@ -14,9 +14,9 @@ #include <asm/mach/pci.h> #include <asm/mach-types.h> -static int irqmap_ebsa285[] __initdata = { IRQ_IN3, IRQ_IN1, IRQ_IN0, IRQ_PCI }; +static int irqmap_ebsa285[] = { IRQ_IN3, IRQ_IN1, IRQ_IN0, IRQ_PCI }; -static int __init ebsa285_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) +static int ebsa285_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) { if (dev->vendor == PCI_VENDOR_ID_CONTAQ && dev->device == PCI_DEVICE_ID_CONTAQ_82C693) |