summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorFeng Tang <feng.tang@intel.com>2013-01-16 00:09:49 +0800
committerJohn Stultz <john.stultz@linaro.org>2013-01-15 18:16:08 -0800
commit05ad717c77b1b8e98a1dd768c3700036d634629e (patch)
treec52d75ca925bcd9b4c7125aad4c1059d7d3a43ee /kernel
parent9ecf37eb7a81e3295a1b274eafb6f83d7d2cabf0 (diff)
downloadblackbird-op-linux-05ad717c77b1b8e98a1dd768c3700036d634629e.tar.gz
blackbird-op-linux-05ad717c77b1b8e98a1dd768c3700036d634629e.zip
timekeeping: Add CONFIG_HAS_PERSISTENT_CLOCK option
Make the persistent clock check a kernel config option, so that some platform can explicitely select it, also make CONFIG_RTC_HCTOSYS and RTC_SYSTOHC depend on its non-existence, which could prevent the persistent clock and RTC code from doing similar thing twice during system's init/suspend/resume phases. If the CONFIG_HAS_PERSISTENT_CLOCK=n, then no change happens for kernel which still does the persistent clock check in timekeeping_init(). Cc: Thomas Gleixner <tglx@linutronix.de> Suggested-by: John Stultz <john.stultz@linaro.org> Signed-off-by: Feng Tang <feng.tang@intel.com> [jstultz: Added dependency for RTC_SYSTOHC as well] Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/time/Kconfig5
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/time/Kconfig b/kernel/time/Kconfig
index 8601f0db1261..f7e45b9b142b 100644
--- a/kernel/time/Kconfig
+++ b/kernel/time/Kconfig
@@ -12,6 +12,11 @@ config CLOCKSOURCE_WATCHDOG
config ARCH_CLOCKSOURCE_DATA
bool
+# Platforms has a persistent clock
+config HAS_PERSISTENT_CLOCK
+ bool
+ default n
+
# Timekeeping vsyscall support
config GENERIC_TIME_VSYSCALL
bool
OpenPOWER on IntegriCloud