Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (76 commits)
  [ARM] 4002/1: S3C24XX: leave parent IRQs unmasked
  [ARM] 4001/1: S3C24XX: shorten reboot time
  [ARM] 3983/2: remove unused argument to __bug()
  [ARM] 4000/1: Osiris: add third serial port in
  [ARM] 3999/1: RX3715: suspend to RAM support
  [ARM] 3998/1: VR1000: LED platform devices
  [ARM] 3995/1: iop13xx: add iop13xx support
  [ARM] 3968/1: iop13xx: add iop13xx_defconfig
  [ARM] Update mach-types
  [ARM] Allow gcc to optimise arm_add_memory a little more
  [ARM] 3991/1: i.MX/MX1 high resolution time source
  [ARM] 3990/1: i.MX/MX1 more precise PLL decode
  [ARM] 3986/1: H1940: suspend to RAM support
  [ARM] 3985/1: ixp4xx clocksource cleanup
  [ARM] 3984/1: ixp4xx/nslu2: Fix disk LED numbering (take 2)
  [ARM] 3994/1: ixp23xx: fix handling of pci master aborts
  [ARM] 3981/1: sched_clock for PXA2xx
  [ARM] 3980/1: extend the ARM Versatile sched_clock implementation from 32 to 63 bit
  [ARM] 3979/1: extend the SA11x0 sched_clock implementation from 32 to 63 bit period
  [ARM] 3978/1: macro to provide a 63-bit value from a 32-bit hardware counter
  ...
parents 6ee7e78e 6705cda2

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -348,6 +348,13 @@ P: Ian Molton 
M:	spyro@f2s.com

S:	Maintained



ARM/ATMEL AT91RM9200 ARM ARCHITECTURE

P:      Andrew Victor

M:      andrew@sanpeople.com

L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)

W:      http://maxim.org.za/at91_26.html

S:      Maintained



ARM/CORGI MACHINE SUPPORT

P:	Richard Purdie

M:	rpurdie@rpsys.net

arch/arm/Kconfig

+17 −1
Original line number Diff line number Diff line
@@ -223,6 +223,12 @@ config ARCH_IOP33X 
	help

	  Support for Intel's IOP33X (XScale) family of processors.



config ARCH_IOP13XX

	bool "IOP13xx-based"

	select PCI

	help

	  Support for Intel's IOP13XX (XScale) family of processors.



config ARCH_IXP4XX

	bool "IXP4xx-based"

	depends on MMU
@@ -331,6 +337,8 @@ source "arch/arm/mach-iop32x/Kconfig" 


source "arch/arm/mach-iop33x/Kconfig"



source "arch/arm/mach-iop13xx/Kconfig"



source "arch/arm/mach-ixp4xx/Kconfig"



source "arch/arm/mach-ixp2000/Kconfig"
@@ -374,6 +382,14 @@ config PLAT_IOP 


source arch/arm/mm/Kconfig



config IWMMXT

	bool "Enable iWMMXt support"

	depends CPU_XSCALE || CPU_XSC3

	default y if PXA27x

	help

	  Enable support for iWMMXt context switching at run time if

	  running on a CPU that supports it.



#  bool 'Use XScale PMU as timer source' CONFIG_XSCALE_PMU_TIMER

config XSCALE_PMU

	bool
@@ -583,7 +599,7 @@ config LEDS 
		   ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \

		   ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \

		   ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \

		   ARCH_AT91RM9200 || MACH_TRIZEPS4

		   ARCH_AT91 || MACH_TRIZEPS4

	help

	  If you say Y here, the LEDs on your machine will be used

	  to provide useful information about your current system status.

arch/arm/Kconfig.debug

+0 −4
Original line number Diff line number Diff line
@@ -32,10 +32,6 @@ config DEBUG_USER 
	      8 - SIGSEGV faults

	     16 - SIGBUS faults



config DEBUG_WAITQ

	bool "Wait queue debugging"

	depends on DEBUG_KERNEL



config DEBUG_ERRORS

	bool "Verbose kernel error messages"

	depends on DEBUG_KERNEL

arch/arm/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ CPPFLAGS_vmlinux.lds = -DTEXT_OFFSET=$(TEXT_OFFSET) 
OBJCOPYFLAGS	:=-O binary -R .note -R .comment -S

GZFLAGS		:=-9

#CFLAGS		+=-pipe

# Explicitly specifiy 32-bit ARM ISA since toolchain default can be -mthumb:

CFLAGS		+=$(call cc-option,-marm,)



# Do not use arch/arm/defconfig - it's always outdated.

# Select a platform tht is kept up-to-date
@@ -108,6 +110,7 @@ endif 
 machine-$(CONFIG_ARCH_CLPS711X)   := clps711x

 machine-$(CONFIG_ARCH_IOP32X)	   := iop32x

 machine-$(CONFIG_ARCH_IOP33X)	   := iop33x

 machine-$(CONFIG_ARCH_IOP13XX)	   := iop13xx

 machine-$(CONFIG_ARCH_IXP4XX)	   := ixp4xx

 machine-$(CONFIG_ARCH_IXP2000)    := ixp2000

 machine-$(CONFIG_ARCH_IXP23XX)    := ixp23xx

arch/arm/common/gic.c

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ void __init gic_dist_init(void __iomem *base) 
	 */

	for (i = 29; i < max_irq; i++) {

		set_irq_chip(i, &gic_chip);

		set_irq_handler(i, do_level_IRQ);

		set_irq_handler(i, handle_level_irq);

		set_irq_flags(i, IRQF_VALID | IRQF_PROBE);

	}