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

	- description of the virtual memory layout

nwfpe/

	- NWFPE floating point emulator documentation

swp_emulation

	- SWP/SWPB emulation handler/logging description

Software emulation of deprecated SWP instruction (CONFIG_SWP_EMULATE)

---------------------------------------------------------------------

ARMv6 architecture deprecates use of the SWP/SWPB instructions, and recommeds

moving to the load-locked/store-conditional instructions LDREX and STREX.

ARMv7 multiprocessing extensions introduce the ability to disable these

instructions, triggering an undefined instruction exception when executed.

Trapped instructions are emulated using an LDREX/STREX or LDREXB/STREXB

sequence. If a memory access fault (an abort) occurs, a segmentation fault is

signalled to the triggering process.

/proc/cpu/swp_emulation holds some statistics/information, including the PID of

the last process to trigger the emulation to be invocated. For example:

---

Emulated SWP:		12

Emulated SWPB:		0

Aborted SWP{B}:		1

Last process:		314

---

NOTE: when accessing uncached shared regions, LDREX/STREX rely on an external

transaction monitoring block called a global monitor to maintain update

atomicity. If your system does not implement a global monitor, this option can

cause programs that perform SWP operations to uncached memory to deadlock, as

the STREX operation will always fail.

	bool

	default y

	select HAVE_AOUT

	select HAVE_DMA_API_DEBUG

	select HAVE_IDE

	select HAVE_MEMBLOCK

	select RTC_LIB

	select HAVE_FUNCTION_TRACER if (!XIP_KERNEL)

	select HAVE_FTRACE_MCOUNT_RECORD if (!XIP_KERNEL)

	select HAVE_DYNAMIC_FTRACE if (!XIP_KERNEL)

	select HAVE_FUNCTION_GRAPH_TRACER if (!THUMB2_KERNEL)

	select HAVE_GENERIC_DMA_COHERENT

	select HAVE_KERNEL_GZIP

	select HAVE_KERNEL_LZO

	select PERF_USE_VMALLOC

	select HAVE_REGS_AND_STACK_ACCESS_API

	select HAVE_HW_BREAKPOINT if (PERF_EVENTS && (CPU_V6 || CPU_V7))

	select HAVE_C_RECORDMCOUNT

	help

	  The ARM series is a line of low-power-consumption RISC chip designs

	  licensed by ARM Ltd and targeted at embedded applications and

config HAVE_PWM

	bool

config MIGHT_HAVE_PCI

	bool

config SYS_SUPPORTS_APM_EMULATION

	bool

config HAVE_SCHED_CLOCK

	bool

config GENERIC_GPIO

	bool

	bool "ARM Ltd. Integrator family"

	select ARM_AMBA

	select ARCH_HAS_CPUFREQ

	select COMMON_CLKDEV

	select CLKDEV_LOOKUP

	select ICST

	select GENERIC_CLOCKEVENTS

	select PLAT_VERSATILE

config ARCH_REALVIEW

	bool "ARM Ltd. RealView family"

	select ARM_AMBA

	select COMMON_CLKDEV

	select CLKDEV_LOOKUP

	select HAVE_SCHED_CLOCK

	select ICST

	select GENERIC_CLOCKEVENTS

	select ARCH_WANT_OPTIONAL_GPIOLIB

	bool "ARM Ltd. Versatile family"

	select ARM_AMBA

	select ARM_VIC

	select COMMON_CLKDEV

	select CLKDEV_LOOKUP

	select HAVE_SCHED_CLOCK

	select ICST

	select GENERIC_CLOCKEVENTS

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select ARM_AMBA

	select ARM_TIMER_SP804

	select COMMON_CLKDEV

	select CLKDEV_LOOKUP

	select GENERIC_CLOCKEVENTS

	select HAVE_CLK

	select HAVE_SCHED_CLOCK

	select ICST

	select PLAT_VERSATILE

	help

	depends on MMU

	select CPU_V6

	select ARM_AMBA

	select COMMON_CLKDEV

	select CLKDEV_LOOKUP

	select GENERIC_CLOCKEVENTS

	select ARCH_WANT_OPTIONAL_GPIOLIB

	help

	select CPU_V6

	select GENERIC_CLOCKEVENTS

	select ARM_GIC

	select MIGHT_HAVE_PCI

	select PCI_DOMAINS if PCI

	help

	  Support for Cavium Networks CNS3XXX platform.

	select CPU_ARM920T

	select ARM_AMBA

	select ARM_VIC

	select COMMON_CLKDEV

	select CLKDEV_LOOKUP

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_HAS_HOLES_MEMORYMODEL

	select ARCH_USES_GETTIMEOFFSET

	bool "Freescale MXC/iMX-based"

	select GENERIC_CLOCKEVENTS

	select ARCH_REQUIRE_GPIOLIB

	select COMMON_CLKDEV

	select CLKDEV_LOOKUP

	help

	  Support for Freescale MXC/iMX-based family of processors

config ARCH_MXS

	bool "Freescale MXS-based"

	select GENERIC_CLOCKEVENTS

	select ARCH_REQUIRE_GPIOLIB

	select COMMON_CLKDEV

	help

	  Support for Freescale MXS-based family of processors

config ARCH_STMP3XXX

	bool "Freescale STMP3xxx"

	select CPU_ARM926T

	select COMMON_CLKDEV

	select CLKDEV_LOOKUP

	select ARCH_REQUIRE_GPIOLIB

	select GENERIC_CLOCKEVENTS

	select USB_ARCH_HAS_EHCI

	select CPU_XSCALE

	select GENERIC_GPIO

	select GENERIC_CLOCKEVENTS

	select HAVE_SCHED_CLOCK

	select MIGHT_HAVE_PCI

	select DMABOUNCE if PCI

	help

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

	select HAVE_IDE

	select ARM_AMBA

	select USB_ARCH_HAS_OHCI

	select COMMON_CLKDEV

	select CLKDEV_LOOKUP

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	help

	bool "Marvell PXA168/910/MMP2"

	depends on MMU

	select ARCH_REQUIRE_GPIOLIB

	select COMMON_CLKDEV

	select CLKDEV_LOOKUP

	select GENERIC_CLOCKEVENTS

	select HAVE_SCHED_CLOCK

	select TICK_ONESHOT

	select PLAT_PXA

	select SPARSE_IRQ

	bool "Nuvoton W90X900 CPU"

	select CPU_ARM926T

	select ARCH_REQUIRE_GPIOLIB

	select COMMON_CLKDEV

	select CLKDEV_LOOKUP

	select GENERIC_CLOCKEVENTS

	help

	  Support for Nuvoton (Winbond logic dept.) ARM9 processor,

config ARCH_NUC93X

	bool "Nuvoton NUC93X CPU"

	select CPU_ARM926T

	select COMMON_CLKDEV

	select CLKDEV_LOOKUP

	help

	  Support for Nuvoton (Winbond logic dept.) NUC93X MCU,The NUC93X is a

	  low-power and high performance MPEG-4/JPEG multimedia controller chip.

config ARCH_TEGRA

	bool "NVIDIA Tegra"

	select CLKDEV_LOOKUP

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select GENERIC_GPIO

	select HAVE_CLK

	select COMMON_CLKDEV

	select HAVE_SCHED_CLOCK

	select ARCH_HAS_BARRIERS if CACHE_L2X0

	select ARCH_HAS_CPUFREQ

	help

config ARCH_PNX4008

	bool "Philips Nexperia PNX4008 Mobile"

	select CPU_ARM926T

	select COMMON_CLKDEV

	select CLKDEV_LOOKUP

	select ARCH_USES_GETTIMEOFFSET

	help

	  This enables support for Philips PNX4008 mobile platform.

	depends on MMU

	select ARCH_MTD_XIP

	select ARCH_HAS_CPUFREQ

	select COMMON_CLKDEV

	select CLKDEV_LOOKUP

	select ARCH_REQUIRE_GPIOLIB

	select GENERIC_CLOCKEVENTS

	select HAVE_SCHED_CLOCK

	select TICK_ONESHOT

	select PLAT_PXA

	select SPARSE_IRQ

	select CPU_FREQ

	select GENERIC_CLOCKEVENTS

	select HAVE_CLK

	select HAVE_SCHED_CLOCK

	select TICK_ONESHOT

	select ARCH_REQUIRE_GPIOLIB

	help

	bool "Telechips TCC ARM926-based systems"

	select CPU_ARM926T

	select HAVE_CLK

	select COMMON_CLKDEV

	select CLKDEV_LOOKUP

	select GENERIC_CLOCKEVENTS

	help

	  Support for Telechips TCC ARM926-based systems.

	bool "ST-Ericsson U300 Series"

	depends on MMU

	select CPU_ARM926T

	select HAVE_SCHED_CLOCK

	select HAVE_TCM

	select ARM_AMBA

	select ARM_VIC

	select GENERIC_CLOCKEVENTS

	select COMMON_CLKDEV

	select CLKDEV_LOOKUP

	select GENERIC_GPIO

	help

	  Support for ST-Ericsson U300 series mobile platforms.

	select CPU_V7

	select ARM_AMBA

	select GENERIC_CLOCKEVENTS

	select COMMON_CLKDEV

	select CLKDEV_LOOKUP

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_HAS_CPUFREQ

	help

	  Support for ST-Ericsson's Ux500 architecture

	select ARM_AMBA

	select ARM_VIC

	select CPU_ARM926T

	select COMMON_CLKDEV

	select CLKDEV_LOOKUP

	select GENERIC_CLOCKEVENTS

	select ARCH_REQUIRE_GPIOLIB

	help

	select ARCH_REQUIRE_GPIOLIB

	select ZONE_DMA

	select HAVE_IDE

	select COMMON_CLKDEV

	select CLKDEV_LOOKUP

	select GENERIC_ALLOCATOR

	select ARCH_HAS_HOLES_MEMORYMODEL

	help

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_HAS_CPUFREQ

	select GENERIC_CLOCKEVENTS

	select HAVE_SCHED_CLOCK

	select ARCH_HAS_HOLES_MEMORYMODEL

	help

	  Support for TI's OMAP platform (OMAP1/2/3/4).

	bool "ST SPEAr"

	select ARM_AMBA

	select ARCH_REQUIRE_GPIOLIB

	select COMMON_CLKDEV

	select CLKDEV_LOOKUP

	select GENERIC_CLOCKEVENTS

	select HAVE_CLK

	help

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

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

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

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

config PLAT_IOP

	bool

	select GENERIC_CLOCKEVENTS

	select HAVE_SCHED_CLOCK

config PLAT_ORION

	bool

	select HAVE_SCHED_CLOCK

config PLAT_PXA

	bool

config IWMMXT

	bool "Enable iWMMXt support"

	depends on CPU_XSCALE || CPU_XSC3 || CPU_MOHAWK

	default y if PXA27x || PXA3xx || ARCH_MMP

	depends on CPU_XSCALE || CPU_XSC3 || CPU_MOHAWK || CPU_PJ4

	default y if PXA27x || PXA3xx || PXA95x || ARCH_MMP

	help

	  Enable support for iWMMXt context switching at run time if

	  running on a CPU that supports it.

	default y

	bool

config MULTI_IRQ_HANDLER

	bool

	help

	  Allow each machine to specify it's own IRQ handler at run time.

if !MMU

source "arch/arm/Kconfig-nommu"

endif

	bool

config PCI

	bool "PCI support" if ARCH_INTEGRATOR_AP || ARCH_VERSATILE_PB || ARCH_IXP4XX || ARCH_KS8695 || MACH_ARMCORE || ARCH_CNS3XXX

	bool "PCI support" if MIGHT_HAVE_PCI

	help

	  Find out whether you have a PCI motherboard. PCI is the name of a

	  bus system, i.e. the way the CPU talks to the other stuff inside

	bool

	depends on PCI

config PCI_NANOENGINE

	bool "BSE nanoEngine PCI support"

	depends on SA1100_NANOENGINE

	help

	  Enable PCI on the BSE nanoEngine board.

config PCI_SYSCALL

	def_bool PCI

	depends on GENERIC_CLOCKEVENTS

	depends on REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP || \

		 MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \

		 ARCH_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4

		 ARCH_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || \

		 ARCH_MSM_SCORPIONMP

	select USE_GENERIC_SMP_HELPERS

	select HAVE_ARM_SCU

	select HAVE_ARM_SCU if !ARCH_MSM_SCORPIONMP

	help

	  This enables support for systems with more than one CPU. If you have

	  a system with only one CPU, like most personal computers, say N. If

config SMP_ON_UP

	bool "Allow booting SMP kernel on uniprocessor systems (EXPERIMENTAL)"

	depends on EXPERIMENTAL

	depends on SMP && !XIP && !THUMB2_KERNEL

	depends on SMP && !XIP

	default y

	help

	  SMP kernels contain instructions which fail on non-SMP processors.

config HAVE_ARM_TWD

	bool

	depends on SMP

	select TICK_ONESHOT

	help

	  This options enables support for the ARM timer and watchdog unit

config HOTPLUG_CPU

	bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"

	depends on SMP && HOTPLUG && EXPERIMENTAL

	depends on !ARCH_MSM

	help

	  Say Y here to experiment with turning CPUs off and on.  CPUs

	  can be controlled through /sys/devices/system/cpu.

	bool "Use local timer interrupts"

	depends on SMP

	default y

	select HAVE_ARM_TWD

	select HAVE_ARM_TWD if !ARCH_MSM_SCORPIONMP

	help

	  Enable support for local timers on SMP platforms, rather then the

	  legacy IPI broadcast method.  Local timers allows the system

	default 100

config THUMB2_KERNEL

	bool "Compile the kernel in Thumb-2 mode"

	bool "Compile the kernel in Thumb-2 mode (EXPERIMENTAL)"

	depends on CPU_V7 && !CPU_V6 && EXPERIMENTAL

	select AEABI

	select ARM_ASM_UNIFIED

config CC_STACKPROTECTOR

	bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)"

	depends on EXPERIMENTAL

	help

	  This option turns on the -fstack-protector GCC feature. This

	  feature puts, at the beginning of functions, a canary value on

	  Should the atags used to boot the kernel be exported in an "atags"

	  file in procfs. Useful with kexec.

config CRASH_DUMP

	bool "Build kdump crash kernel (EXPERIMENTAL)"

	depends on EXPERIMENTAL

	help

	  Generate crash dump after being started by kexec. This should

	  be normally only set in special crash dump kernels which are

	  loaded in the main kernel with kexec-tools into a specially

	  reserved region and then later executed after a crash by

	  kdump/kexec. The crash dump kernel must be compiled to a

	  memory address not used by the main kernel

	  For more details see Documentation/kdump/kdump.txt

config AUTO_ZRELADDR

	bool "Auto calculation of the decompressed kernel image address"

	depends on !ZBOOT_ROM && !ARCH_U300

	  Internal configuration node for common cpufreq on Samsung SoC

config CPU_FREQ_S3C24XX

	bool "CPUfreq driver for Samsung S3C24XX series CPUs"

	bool "CPUfreq driver for Samsung S3C24XX series CPUs (EXPERIMENTAL)"

	depends on ARCH_S3C2410 && CPU_FREQ && EXPERIMENTAL

	select CPU_FREQ_S3C

	help

	  If in doubt, say N.

config CPU_FREQ_S3C24XX_PLL

	bool "Support CPUfreq changing of PLL frequency"

	bool "Support CPUfreq changing of PLL frequency (EXPERIMENTAL)"

	depends on CPU_FREQ_S3C24XX && EXPERIMENTAL

	help

	  Compile in support for changing the PLL frequency from the

config FRAME_POINTER

	bool

	depends on !THUMB2_KERNEL

	default y if !ARM_UNWIND

	default y if !ARM_UNWIND || FUNCTION_GRAPH_TRACER

	help

	  If you say N here, the resulting kernel will be slightly smaller and

	  faster. However, if neither FRAME_POINTER nor ARM_UNWIND are enabled,

	  reported is severely limited.

config ARM_UNWIND

	bool "Enable stack unwinding support"

	bool "Enable stack unwinding support (EXPERIMENTAL)"

	depends on AEABI && EXPERIMENTAL

	default y

	help

machine-$(CONFIG_ARCH_MV78XX0)		:= mv78xx0

machine-$(CONFIG_ARCH_MX1)		:= imx

machine-$(CONFIG_ARCH_MX2)		:= imx

machine-$(CONFIG_ARCH_MX25)		:= mx25

machine-$(CONFIG_ARCH_MX25)		:= imx

machine-$(CONFIG_ARCH_MX3)		:= mx3

machine-$(CONFIG_ARCH_MX5)		:= mx5

machine-$(CONFIG_ARCH_MXC91231)		:= mxc91231

machine-$(CONFIG_ARCH_MXS)		:= mxs

machine-$(CONFIG_ARCH_NETX)		:= netx

machine-$(CONFIG_ARCH_NOMADIK)		:= nomadik

machine-$(CONFIG_ARCH_NS9XXX)		:= ns9xxx