Merge master.kernel.org:/home/rmk/linux-2.6-serial

[sfrench/cifs-2.6.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 11fff042aa817d022139947e82093d24a3e567a4..3bfef0934c9d39162e346e73764f379aad8946f4 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -194,6 +194,13 @@ config ARCH_VERSATILE
        help
          This enables support for ARM Ltd Versatile board.
 
+config ARCH_REALVIEW
+       bool "RealView"
+       select ARM_AMBA
+       select ICST307
+       help
+         This enables support for ARM Ltd RealView boards.
+
 config ARCH_IMX
        bool "IMX"
 
@@ -204,6 +211,7 @@ config ARCH_H720X
 
 config ARCH_AAEC2000
        bool "Agilent AAEC-2000 based"
+       select ARM_AMBA
        help
          This enables support for systems based on the Agilent AAEC-2000
 
@@ -243,6 +251,8 @@ source "arch/arm/mach-versatile/Kconfig"
 
 source "arch/arm/mach-aaec2000/Kconfig"
 
+source "arch/arm/mach-realview/Kconfig"
+
 # Definitions to make life easier
 config ARCH_ACORN
        bool
@@ -314,7 +324,7 @@ menu "Kernel Features"
 
 config SMP
        bool "Symmetric Multi-Processing (EXPERIMENTAL)"
-       depends on EXPERIMENTAL && BROKEN #&& n
+       depends on EXPERIMENTAL && REALVIEW_MPCORE
        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
@@ -339,6 +349,23 @@ config NR_CPUS
        depends on SMP
        default "4"
 
+config HOTPLUG_CPU
+       bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"
+       depends on SMP && HOTPLUG && EXPERIMENTAL
+       help
+         Say Y here to experiment with turning CPUs off and on.  CPUs
+         can be controlled through /sys/devices/system/cpu.
+
+config LOCAL_TIMERS
+       bool "Use local timer interrupts"
+       depends on SMP && n
+       default y
+       help
+         Enable support for local timers on SMP platforms, rather then the
+         legacy IPI broadcast method.  Local timers allows the system
+         accounting to be spread across the timer interval, preventing a
+         "thundering herd" at every timer tick.
+
 config PREEMPT
        bool "Preemptible Kernel (EXPERIMENTAL)"
        depends on EXPERIMENTAL
@@ -568,7 +595,7 @@ config FPE_NWFPE
 
 config FPE_NWFPE_XP
        bool "Support extended precision"
-       depends on FPE_NWFPE && !CPU_BIG_ENDIAN
+       depends on FPE_NWFPE
        help
          Say Y to include 80-bit support in the kernel floating-point
          emulator.  Otherwise, only 32 and 64-bit support is compiled in.