From 7678443c4b3709e19cc83b671d79540b4b5e810c Mon Sep 17 00:00:00 2001
From: Feng Tang <feng.tang@intel.com>
Date: Wed, 16 Jan 2013 00:09:49 +0800
Subject: [PATCH] --- yaml --- r: 350165 b: refs/heads/master c:
 05ad717c77b1b8e98a1dd768c3700036d634629e h: refs/heads/master i:   350163:
 585ca7254cdf4d6604ed726e0305524cfa5e3f4d v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/rtc/Kconfig  | 2 ++
 trunk/include/linux/time.h | 5 +++++
 trunk/kernel/time/Kconfig  | 5 +++++
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9e1189363054..fb0e0597e191 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ecf37eb7a81e3295a1b274eafb6f83d7d2cabf0
+refs/heads/master: 05ad717c77b1b8e98a1dd768c3700036d634629e
diff --git a/trunk/drivers/rtc/Kconfig b/trunk/drivers/rtc/Kconfig
index b377e9672497..05761de7929b 100644
--- a/trunk/drivers/rtc/Kconfig
+++ b/trunk/drivers/rtc/Kconfig
@@ -20,6 +20,7 @@ if RTC_CLASS
 config RTC_HCTOSYS
 	bool "Set system time from RTC on startup and resume"
 	default y
+	depends on !HAS_PERSISTENT_CLOCK
 	help
 	  If you say yes here, the system time (wall clock) will be set using
 	  the value read from a specified RTC device. This is useful to avoid
@@ -28,6 +29,7 @@ config RTC_HCTOSYS
 config RTC_SYSTOHC
 	bool "Set the RTC time based on NTP synchronization"
 	default y
+	depends on !HAS_PERSISTENT_CLOCK
 	help
 	  If you say yes here, the system time (wall clock) will be stored
 	  in the RTC specified by RTC_HCTOSYS_DEVICE approximately every 11
diff --git a/trunk/include/linux/time.h b/trunk/include/linux/time.h
index dfbc4e82e8ba..369b6e3b87d8 100644
--- a/trunk/include/linux/time.h
+++ b/trunk/include/linux/time.h
@@ -116,10 +116,15 @@ static inline bool timespec_valid_strict(const struct timespec *ts)
 }
 
 extern bool persistent_clock_exist;
+
+#ifdef CONFIG_HAS_PERSISTENT_CLOCK
+#define has_persistent_clock()	true
+#else
 static inline bool has_persistent_clock(void)
 {
 	return persistent_clock_exist;
 }
+#endif
 
 extern void read_persistent_clock(struct timespec *ts);
 extern void read_boot_clock(struct timespec *ts);
diff --git a/trunk/kernel/time/Kconfig b/trunk/kernel/time/Kconfig
index 8601f0db1261..f7e45b9b142b 100644
--- a/trunk/kernel/time/Kconfig
+++ b/trunk/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