timekeeping: Switch HAS_PERSISTENT_CLOCK to ALWAYS_USE_PERSISTENT_CLOCK

Jason pointed out the HAS_PERSISTENT_CLOCK name isn't
quite accurate for the config, as some systems may have
the persistent_clock in some cases, but not always.

So change the config name to the more clear
ALWAYS_USE_PERSISTENT_CLOCK.

Signed-off-by: John Stultz <john.stultz@linaro.org>

4 files changed, 5 insertions, 5 deletions

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index a4135b5e562e..335da90560e4 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -108,7 +108,7 @@ config X86
         select GENERIC_STRNLEN_USER
         select HAVE_RCU_USER_QS if X86_64
         select HAVE_IRQ_TIME_ACCOUNTING
-        select HAS_PERSISTENT_CLOCK
+        select ALWAYS_USE_PERSISTENT_CLOCK
         select GENERIC_KERNEL_THREAD
         select GENERIC_KERNEL_EXECVE
         select MODULES_USE_ELF_REL if X86_32
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 05761de7929b..da60de01f732 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -20,7 +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
+        depends on !ALWAYS_USE_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
@@ -29,7 +29,7 @@ config RTC_HCTOSYS
 config RTC_SYSTOHC
         bool "Set the RTC time based on NTP synchronization"
         default y
-        depends on !HAS_PERSISTENT_CLOCK
+        depends on !ALWAYS_USE_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/include/linux/time.h b/include/linux/time.h
index 369b6e3b87d8..476e1d7b2c37 100644
--- a/include/linux/time.h
+++ b/include/linux/time.h
@@ -117,7 +117,7 @@ static inline bool timespec_valid_strict(const struct timespec *ts)
 
 extern bool persistent_clock_exist;
 
-#ifdef CONFIG_HAS_PERSISTENT_CLOCK
+#ifdef ALWAYS_USE_PERSISTENT_CLOCK
 #define has_persistent_clock()  true
 #else
 static inline bool has_persistent_clock(void)
diff --git a/kernel/time/Kconfig b/kernel/time/Kconfig
index f7e45b9b142b..0dddb9d09d0b 100644
--- a/kernel/time/Kconfig
+++ b/kernel/time/Kconfig
@@ -13,7 +13,7 @@ config ARCH_CLOCKSOURCE_DATA
         bool
 
 # Platforms has a persistent clock
-config HAS_PERSISTENT_CLOCK
+config ALWAYS_USE_PERSISTENT_CLOCK
         bool
         default n