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

Commit d0d42df2 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branches 'at91', 'ep93xx', 'iop', 'kprobes', 'ks8695', 'misc', 'msm',... 

Merge branches 'at91', 'ep93xx', 'iop', 'kprobes', 'ks8695', 'misc', 'msm', 's3c2410', 'sa1100' and 'vfp' into devel

* at91: (24 commits)
  [ARM] 4615/4: sam926[13]ek buttons updated
  [ARM] 4765/1: [AT91] AT91CAP9A-DK board support
  [ARM] 4764/1: [AT91] AT91CAP9 core support
  [ARM] 4738/1: at91sam9261: Remove udc pullup enabling in board initialisation
  [ARM] 4761/1: [AT91] Board-support for NEW_LEDs
  [ARM] 4760/1: [AT91] SPI CS0 errata on AT91RM9200
  [ARM] 4759/1: [AT91] Buttons on CSB300
  [ARM] 4758/1: [AT91] LEDs
  [ARM] 4757/1: [AT91] UART initialization
  [ARM] 4756/1: [AT91] Makefile cleanup
  [ARM] 4755/1: [AT91] NAND update
  [ARM] 4754/1: [AT91] SSC library support
  [ARM] 4753/1: [AT91] Use DMA_BIT_MASK
  [ARM] 4752/1: [AT91] RTT, RTC and WDT peripherals on SAM9
  [ARM] 4751/1: [AT91] ISI peripheral on SAM9263
  [ARM] 4750/1: [AT91] STN LCD displays on SAM9261
  [ARM] 4734/1: at91sam9263ek: include IRQ for Ethernet PHY
  [ARM] 4646/1: AT91: configurable HZ, default to 128
  [ARM] 4688/1: at91: speed-up irq processing
  [ARM] 4657/1: AT91: Header definition update
  ...

* ep93xx:
  [ARM] 4671/1: ep93xx: remove obsolete gpio_line_* operations
  [ARM] 4670/1: ep93xx: implement IRQT_BOTHEDGE gpio irq sense type
  [ARM] 4669/1: ep93xx: simplify GPIO code and cleanups
  [ARM] 4668/1: ep93xx: implement new GPIO API

* iop:
  [ARM] 4770/1: GLAN Tank: correct physmap_flash_data width field
  [ARM] 4732/1: GLAN Tank: register rtc-rs5c372 i2c device
  [ARM] 4708/1: iop: update defconfigs for 2.6.24

* kprobes:
  ARM kprobes: let's enable it
  ARM kprobes: special hook for the kprobes breakpoint handler
  ARM kprobes: prevent some functions involved with kprobes from being probed
  ARM kprobes: don't let a single-stepped stmdb corrupt the exception stack
  ARM kprobes: add the kprobes hook to the page fault handler
  ARM kprobes: core code
  ARM kprobes: instruction single-stepping support

* ks8695:
  [ARM] 4603/1: KS8695: debugfs interface to view pin state
  [ARM] 4601/1: KS8695: PCI support

* misc:
  [ARM] remove duplicate includes
  [ARM] CONFIG_DEBUG_STACK_USAGE
  [ARM] 4689/1: small comment wrap fix
  [ARM] 4687/1: Trivial arch/arm/kernel/entry-common.S comment fix
  [ARM] 4666/1: ixp4xx: fix sparse warnings in include/asm-arm/arch-ixp4xx/io.h
  [ARM] remove reference to non-existent MTD_OBSOLETE_CHIPS
  [SERIAL] 21285: Report baud rate back via termios
  [ARM] Remove pointless casts from void pointers,
  [ARM] Misc minor interrupt handler cleanups
  [ARM] Remove at91_lcdc.h
  [ARM] ARRAY_SIZE() cleanup
  [ARM] Update mach-types

* msm:
  [ARM] msm: dma support for MSM7X00A
  [ARM] msm: board file for MACH_HALIBUT (QCT MSM7200A)
  [ARM] msm: irq and timer support for ARCH_MSM7X00A
  [ARM] msm: core platform support for ARCH_MSM7X00A

* s3c2410: (33 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
  ...

* sa1100:
  [ARM] sa1100: add clock source support

* vfp:
  [ARM] 4584/2: ARMv7: Add Advanced SIMD (NEON) extension support
  [ARM] 4583/1: ARMv7: Add VFPv3 support
  [ARM] 4582/2: Add support for the common VFP subarchitecture
parents e01dbdb4 eaf858a9 6331acd7 b696b6b4 5de865b4 20118ff9 1d7d4f54 bfe645ad 06dbbd69 d142b6e7 b5872db4

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

+31 −3
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.
@@ -366,6 +367,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 +411,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"
@@ -477,6 +490,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 +672,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
@@ -951,7 +967,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

	help

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

	  if your hardware includes a VFP unit.
@@ -961,6 +977,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

arch/arm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -139,6 +139,7 @@ endif 
 machine-$(CONFIG_ARCH_KS8695)     := ks8695

  incdir-$(CONFIG_ARCH_MXC)	   := mxc

 machine-$(CONFIG_ARCH_MX3)	   := mx3

 machine-$(CONFIG_ARCH_MSM7X00A)   := msm



ifeq ($(CONFIG_ARCH_EBSA110),y)

# This is what happens if you forget the IOCS16 line.