Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[firefly-linux-kernel-4.4.55.git] / kernel / time / Kconfig

diff --git a/kernel/time/Kconfig b/kernel/time/Kconfig
index f448513a45ed6d59ac5e7363fa5e43dafae34820..d626dc98e8df952eff1df8ced84b2557475fe6c6 100644 (file)
--- a/kernel/time/Kconfig
+++ b/kernel/time/Kconfig
@@ -12,6 +12,11 @@ config CLOCKSOURCE_WATCHDOG
 config ARCH_CLOCKSOURCE_DATA
        bool
 
+# Clocksources require validation of the clocksource against the last
+# cycle update - x86/TSC misfeature
+config CLOCKSOURCE_VALIDATE_LAST_CYCLE
+       bool
+
 # Timekeeping vsyscall support
 config GENERIC_TIME_VSYSCALL
        bool
@@ -20,10 +25,6 @@ config GENERIC_TIME_VSYSCALL
 config GENERIC_TIME_VSYSCALL_OLD
        bool
 
-# ktime_t scalar 64bit nsec representation
-config KTIME_SCALAR
-       bool
-
 # Old style timekeeping
 config ARCH_USES_GETTIMEOFFSET
        bool