1 files changed, 19 insertions, 2 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index ee8a9ad7bbd9..c8d94dcd8ef7 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -157,7 +157,7 @@ config ARCH_RPC
 config ARCH_SA1100
         bool "SA1100-based"
         select ISA
-        select DISCONTIGMEM
+        select ARCH_DISCONTIGMEM_ENABLE
 
 config ARCH_S3C2410
         bool "Samsung S3C2410"
@@ -346,7 +346,22 @@ config PREEMPT
           Say Y here if you are building a kernel for a desktop, embedded
           or real-time system.  Say N if you are unsure.
 
-config DISCONTIGMEM
+config NO_IDLE_HZ
+        bool "Dynamic tick timer"
+        help
+          Select this option if you want to disable continuous timer ticks
+          and have them programmed to occur as required. This option saves
+          power as the system can remain in idle state for longer.
+
+          By default dynamic tick is disabled during the boot, and can be
+          manually enabled with:
+
+            echo 1 > /sys/devices/system/timer/timer0/dyn_tick
+
+          Alternatively, if you want dynamic tick automatically enabled
+          during boot, pass "dyntick=enable" via the kernel command string.
+
+config ARCH_DISCONTIGMEM_ENABLE
         bool
         default (ARCH_LH7A40X && !LH7A40X_CONTIGMEM)
         help
@@ -355,6 +370,8 @@ config DISCONTIGMEM
           or have huge holes in the physical address space for other reasons.
           See <file:Documentation/vm/numa> for more.
 
+source "mm/Kconfig"
+
 config LEDS
         bool "Timer and CPU usage LEDs"
         depends on ARCH_CDB89712 || ARCH_CO285 || ARCH_EBSA110 || \