Commit f5ce0466 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents c98ff1d0 d2f7eca6

arch/arm/Kconfig

+7 −1
Original line number Diff line number Diff line
@@ -1293,9 +1293,15 @@ config KASAN_SHADOW_OFFSET 


config NR_CPUS

	int "Maximum number of CPUs (2-32)"

	range 2 32

	range 2 16 if DEBUG_KMAP_LOCAL

	range 2 32 if !DEBUG_KMAP_LOCAL

	depends on SMP

	default "4"

	help

	  The maximum number of CPUs that the kernel can support.

	  Up to 32 CPUs can be supported, or up to 16 if kmap_local()

	  debugging is enabled, which uses half of the per-CPU fixmap

	  slots as guard regions.



config HOTPLUG_CPU

	bool "Support for hot-pluggable CPUs"

arch/arm/mach-footbridge/cats-pci.c

+2 −2
Original line number Diff line number Diff line
@@ -15,14 +15,14 @@ 
#include <asm/mach-types.h>



/* cats host-specific stuff */

static int irqmap_cats[] __initdata = { IRQ_PCI, IRQ_IN0, IRQ_IN1, IRQ_IN3 };

static int irqmap_cats[] = { IRQ_PCI, IRQ_IN0, IRQ_IN1, IRQ_IN3 };



static u8 cats_no_swizzle(struct pci_dev *dev, u8 *pin)

{

	return 0;

}



static int __init cats_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)

static int cats_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)

{

	if (dev->irq >= 255)

		return -1;	/* not a valid interrupt. */

arch/arm/mach-footbridge/ebsa285-pci.c

+2 −2
Original line number Diff line number Diff line
@@ -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)

arch/arm/mach-footbridge/netwinder-pci.c

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
 * We now use the slot ID instead of the device identifiers to select

 * which interrupt is routed where.

 */

static int __init netwinder_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)

static int netwinder_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)

{

	switch (slot) {

	case 0:  /* host bridge */

arch/arm/mach-footbridge/personal-pci.c

+2 −3
Original line number Diff line number Diff line
@@ -14,13 +14,12 @@ 
#include <asm/mach/pci.h>

#include <asm/mach-types.h>



static int irqmap_personal_server[] __initdata = {

static int irqmap_personal_server[] = {

	IRQ_IN0, IRQ_IN1, IRQ_IN2, IRQ_IN3, 0, 0, 0,

	IRQ_DOORBELLHOST, IRQ_DMA1, IRQ_DMA2, IRQ_PCI

};



static int __init personal_server_map_irq(const struct pci_dev *dev, u8 slot,

	u8 pin)

static int personal_server_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)

{

	unsigned char line;