Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

[cascardo/linux.git] / kernel / time / Kconfig

diff --git a/kernel/time/Kconfig b/kernel/time/Kconfig
index f6ebc4f..fd42bd4 100644 (file)
--- a/kernel/time/Kconfig
+++ b/kernel/time/Kconfig
@@ -2,38 +2,6 @@
 # Timer subsystem related configuration options
 #
 
-# Core internal switch. Selected by NO_HZ / HIGH_RES_TIMERS. This is
-# only related to the tick functionality. Oneshot clockevent devices
-# are supported independ of this.
-config TICK_ONESHOT
-       bool
-
-config NO_HZ
-       bool "Tickless System (Dynamic Ticks)"
-       depends on !ARCH_USES_GETTIMEOFFSET && GENERIC_CLOCKEVENTS
-       select TICK_ONESHOT
-       help
-         This option enables a tickless system: timer interrupts will
-         only trigger on an as-needed basis both when the system is
-         busy and when the system is idle.
-
-config HIGH_RES_TIMERS
-       bool "High Resolution Timer Support"
-       depends on !ARCH_USES_GETTIMEOFFSET && GENERIC_CLOCKEVENTS
-       select TICK_ONESHOT
-       help
-         This option enables high resolution timer support. If your
-         hardware is not capable then this option only increases
-         the size of the kernel image.
-
-config GENERIC_CLOCKEVENTS_BUILD
-       bool
-       default y
-       depends on GENERIC_CLOCKEVENTS
-
-config GENERIC_CLOCKEVENTS_MIN_ADJUST
-       bool
-
 # Options selectable by arch Kconfig
 
 # Watchdog function for clocksources to detect instabilities
@@ -60,11 +28,52 @@ config ARCH_USES_GETTIMEOFFSET
 config GENERIC_CLOCKEVENTS
        bool
 
+# Migration helper. Builds, but does not invoke
+config GENERIC_CLOCKEVENTS_BUILD
+       bool
+       default y
+       depends on GENERIC_CLOCKEVENTS
+
 # Clockevents broadcasting infrastructure
 config GENERIC_CLOCKEVENTS_BROADCAST
        bool
        depends on GENERIC_CLOCKEVENTS
 
+# Automatically adjust the min. reprogramming time for
+# clock event device
+config GENERIC_CLOCKEVENTS_MIN_ADJUST
+       bool
+
 # Generic update of CMOS clock
 config GENERIC_CMOS_UPDATE
        bool
+
+if GENERIC_CLOCKEVENTS
+menu "Timers subsystem"
+
+# Core internal switch. Selected by NO_HZ / HIGH_RES_TIMERS. This is
+# only related to the tick functionality. Oneshot clockevent devices
+# are supported independ of this.
+config TICK_ONESHOT
+       bool
+
+config NO_HZ
+       bool "Tickless System (Dynamic Ticks)"
+       depends on !ARCH_USES_GETTIMEOFFSET && GENERIC_CLOCKEVENTS
+       select TICK_ONESHOT
+       help
+         This option enables a tickless system: timer interrupts will
+         only trigger on an as-needed basis both when the system is
+         busy and when the system is idle.
+
+config HIGH_RES_TIMERS
+       bool "High Resolution Timer Support"
+       depends on !ARCH_USES_GETTIMEOFFSET && GENERIC_CLOCKEVENTS
+       select TICK_ONESHOT
+       help
+         This option enables high resolution timer support. If your
+         hardware is not capable then this option only increases
+         the size of the kernel image.
+
+endmenu
+endif