Commit bb04af0e 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: (176 commits)
  [ARM] 4795/1: S3C244X: Add armclk and setparent call
  [ARM] 4794/1: S3C24XX: Comonise S3C2440 and S3C2442 clock code
  [ARM] 4793/1: S3C24XX: Add IRQ->GPIO pin mapping function
  [ARM] 4792/1: S3C24XX: Remove warnings from debug-macro.S
  [ARM] 4791/1: S3C2412: Make fclk a parent of msysclk
  [ARM] 4790/1: S3C2412: Fix parent selection for msysclk.
  [ARM] 4789/1: S3C2412: Add missing CLKDIVN register values
  [ARM] 4788/1: S3C24XX: Fix paramet to s3c2410_dma_ctrl if S3C2410_DMAF_AUTOSTART used.
  [ARM] 4787/1: S3C24XX: s3c2410_dma_request() should return the allocated channel number
  [ARM] 4786/1: S3C2412: Add SPI FIFO controll constants
  [ARM] 4785/1: S3C24XX: Add _SHIFT definitions for S3C2410_BANKCON registers
  [ARM] 4784/1: S3C24XX: Fix GPIO restore glitches
  [ARM] 4783/1: S3C24XX: Add s3c2410_gpio_getpull()
  [ARM] 4782/1: S3C24XX: Define FIQ_START for any FIQ users
  [ARM] 4781/1: S3C24XX: DMA suspend and resume support
  [ARM] 4780/1: S3C2412: Allow for seperate DMA channels for TX and RX
  [ARM] 4779/1: S3C2412: Add s3c2412_gpio_set_sleepcfg() call
  [ARM] 4778/1: S3C2412: Add armclk and init from DVS state
  [ARM] 4777/1: S3C24XX: Ensure clk_set_rate() checks the set_rate method for the clk
  [ARM] 4775/1: s3c2410: fix compilation error if only s3c2442 cpu is selected
  ...
parents 0affa456 0ff66f0c

Documentation/cpu-freq/user-guide.txt

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ The following ARM processors are supported by cpufreq: 
ARM Integrator

ARM-SA1100

ARM-SA1110

Intel PXA





1.2 x86

Documentation/kprobes.txt

+1 −0
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ architectures: 
- ppc64

- ia64 (Does not support probes on instruction slot1.)

- sparc64 (Return probes not yet implemented.)

- arm



3. Configuring Kprobes

arch/arm/Kconfig

+52 −5
Original line number Diff line number Diff line
@@ -180,8 +180,8 @@ config ARCH_AT91 
	bool "Atmel AT91"

	select GENERIC_GPIO

	help

	  This enables support for systems based on the Atmel AT91RM9200

	  and AT91SAM9xxx processors.

	  This enables support for systems based on the Atmel AT91RM9200,

	  AT91SAM9 and AT91CAP9 processors.



config ARCH_CLPS7500

	bool "Cirrus CL-PS7500FE"
@@ -217,6 +217,7 @@ config ARCH_EP93XX 
	bool "EP93xx-based"

	select ARM_AMBA

	select ARM_VIC

	select GENERIC_GPIO

	help

	  This enables support for the Cirrus EP93xx series of CPUs.
@@ -333,6 +334,16 @@ config ARCH_MXC 
	help

	  Support for Freescale MXC/iMX-based family of processors



config ARCH_ORION

	bool "Marvell Orion"

	depends on MMU

	select PCI

	select GENERIC_GPIO

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	help

	  Support for Marvell Orion System on Chip family.



config ARCH_PNX4008

	bool "Philips Nexperia PNX4008 Mobile"

	help
@@ -345,6 +356,7 @@ config ARCH_PXA 
	select GENERIC_GPIO

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select TICK_ONESHOT

	help

	  Support for Intel/Marvell's PXA2xx/PXA3xx processor line.
@@ -366,6 +378,7 @@ config ARCH_SA1100 
	select ARCH_DISCONTIGMEM_ENABLE

	select ARCH_MTD_XIP

	select GENERIC_GPIO

	select GENERIC_TIME

	help

	  Support for StrongARM 11x0 based boards.
@@ -409,6 +422,17 @@ config ARCH_OMAP 
	help

	  Support for TI's OMAP platform (OMAP1 and OMAP2).



config ARCH_MSM7X00A

	bool "Qualcomm MSM7X00A"

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	help

	  Support for Qualcomm MSM7X00A based systems.  This runs on the ARM11

	  apps processor of the MSM7X00A and depends on a shared memory

	  interface to the ARM9 modem processor which runs the baseband stack

	  and controls some vital subsystems (clock and power control, etc).

	  <http://www.cdmatech.com/products/msm7200_chipset_solution.jsp>



endchoice



source "arch/arm/mach-clps711x/Kconfig"
@@ -441,6 +465,8 @@ source "arch/arm/mach-omap1/Kconfig" 


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



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



source "arch/arm/plat-s3c24xx/Kconfig"

source "arch/arm/plat-s3c/Kconfig"
@@ -477,6 +503,8 @@ source "arch/arm/mach-davinci/Kconfig" 


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



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



# Definitions to make life easier

config ARCH_ACORN

	bool
@@ -657,6 +685,7 @@ config HZ 
	default 128 if ARCH_L7200

	default 200 if ARCH_EBSA110 || ARCH_S3C2410

	default OMAP_32K_TIMER_HZ if ARCH_OMAP && OMAP_32K_TIMER

	default AT91_TIMER_HZ if ARCH_AT91

	default 100



config AEABI
@@ -716,7 +745,7 @@ config LEDS 
		   ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \

		   ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \

		   ARCH_AT91 || MACH_TRIZEPS4 || ARCH_DAVINCI || \

		   ARCH_KS8695

		   ARCH_KS8695 || MACH_RD88F5182

	help

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

	  to provide useful information about your current system status.
@@ -867,7 +896,7 @@ config KEXEC 


endmenu



if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_IMX )

if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_IMX || ARCH_PXA)



menu "CPU Frequency scaling"
@@ -903,6 +932,12 @@ config CPU_FREQ_IMX 


	  If in doubt, say N.



config CPU_FREQ_PXA

	bool

	depends on CPU_FREQ && ARCH_PXA && PXA25x

	default y

	select CPU_FREQ_DEFAULT_GOV_USERSPACE



endmenu



endif
@@ -951,7 +986,7 @@ config FPE_FASTFPE 


config VFP

	bool "VFP-format floating point maths"

	depends on CPU_V6 || CPU_ARM926T

	depends on CPU_V6 || CPU_ARM926T || CPU_V7 || CPU_FEROCEON

	help

	  Say Y to include VFP support code in the kernel. This is needed

	  if your hardware includes a VFP unit.
@@ -961,6 +996,18 @@ config VFP 


	  Say N if your target does not have VFP hardware.



config VFPv3

	bool

	depends on VFP

	default y if CPU_V7



config NEON

	bool "Advanced SIMD (NEON) Extension support"

	depends on VFPv3 && CPU_V7

	help

	  Say Y to include support code for NEON, the ARMv7 Advanced SIMD

	  Extension.



endmenu



menu "Userspace binary formats"

arch/arm/Kconfig.debug

+6 −0
Original line number Diff line number Diff line
@@ -43,6 +43,12 @@ config DEBUG_ERRORS 
	  you are concerned with the code size or don't want to see these

	  messages.



config DEBUG_STACK_USAGE

	bool "Enable stack utilization instrumentation"

	depends on DEBUG_KERNEL

	help

	  Enables the display of the minimum amount of free stack which each

	  task has ever had available in the sysrq-T output.



# These options are only for real kernel hackers who want to get their hands dirty.

config DEBUG_LL

arch/arm/Kconfig.instrumentation

+10 −0
Original line number Diff line number Diff line
@@ -43,6 +43,16 @@ config OPROFILE_MPCORE 
config OPROFILE_ARM11_CORE

	bool



config KPROBES

	bool "Kprobes"

	depends on KALLSYMS && MODULES && !UML && !XIP_KERNEL

	help

	  Kprobes allows you to trap at almost any kernel address and

	  execute a callback function.  register_kprobe() establishes

	  a probepoint and specifies the callback.  Kprobes is useful

	  for kernel debugging, non-intrusive instrumentation and testing.

	  If in doubt, say "N".



config MARKERS

	bool "Activate markers"

	help

CRA Git | Maintained and supported by SUSTech CRA and CCSE