diff options
| author | John Stultz <john.stultz@linaro.org> | 2013-01-25 20:08:12 -0500 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2013-01-29 17:40:12 -0500 |
| commit | 6f16eebe1ff82176339a0439c98ebec9768b0ee2 (patch) | |
| tree | 8d818d7299f205ebde374f753ac384b5d0ac1835 | |
| parent | e90c83f757fffdacec8b3c5eee5617dcc038338f (diff) | |
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>
| -rw-r--r-- | arch/x86/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/rtc/Kconfig | 4 | ||||
| -rw-r--r-- | include/linux/time.h | 2 | ||||
| -rw-r--r-- | kernel/time/Kconfig | 2 |
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 | |||
| 108 | select GENERIC_STRNLEN_USER | 108 | select GENERIC_STRNLEN_USER |
| 109 | select HAVE_RCU_USER_QS if X86_64 | 109 | select HAVE_RCU_USER_QS if X86_64 |
| 110 | select HAVE_IRQ_TIME_ACCOUNTING | 110 | select HAVE_IRQ_TIME_ACCOUNTING |
| 111 | select HAS_PERSISTENT_CLOCK | 111 | select ALWAYS_USE_PERSISTENT_CLOCK |
| 112 | select GENERIC_KERNEL_THREAD | 112 | select GENERIC_KERNEL_THREAD |
| 113 | select GENERIC_KERNEL_EXECVE | 113 | select GENERIC_KERNEL_EXECVE |
| 114 | select MODULES_USE_ELF_REL if X86_32 | 114 | 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 | |||
| 20 | config RTC_HCTOSYS | 20 | config RTC_HCTOSYS |
| 21 | bool "Set system time from RTC on startup and resume" | 21 | bool "Set system time from RTC on startup and resume" |
| 22 | default y | 22 | default y |
| 23 | depends on !HAS_PERSISTENT_CLOCK | 23 | depends on !ALWAYS_USE_PERSISTENT_CLOCK |
| 24 | help | 24 | help |
| 25 | If you say yes here, the system time (wall clock) will be set using | 25 | If you say yes here, the system time (wall clock) will be set using |
| 26 | the value read from a specified RTC device. This is useful to avoid | 26 | the value read from a specified RTC device. This is useful to avoid |
| @@ -29,7 +29,7 @@ config RTC_HCTOSYS | |||
| 29 | config RTC_SYSTOHC | 29 | config RTC_SYSTOHC |
| 30 | bool "Set the RTC time based on NTP synchronization" | 30 | bool "Set the RTC time based on NTP synchronization" |
| 31 | default y | 31 | default y |
| 32 | depends on !HAS_PERSISTENT_CLOCK | 32 | depends on !ALWAYS_USE_PERSISTENT_CLOCK |
| 33 | help | 33 | help |
| 34 | If you say yes here, the system time (wall clock) will be stored | 34 | If you say yes here, the system time (wall clock) will be stored |
| 35 | in the RTC specified by RTC_HCTOSYS_DEVICE approximately every 11 | 35 | 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) | |||
| 117 | 117 | ||
| 118 | extern bool persistent_clock_exist; | 118 | extern bool persistent_clock_exist; |
| 119 | 119 | ||
| 120 | #ifdef CONFIG_HAS_PERSISTENT_CLOCK | 120 | #ifdef ALWAYS_USE_PERSISTENT_CLOCK |
| 121 | #define has_persistent_clock() true | 121 | #define has_persistent_clock() true |
| 122 | #else | 122 | #else |
| 123 | static inline bool has_persistent_clock(void) | 123 | 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 | |||
| 13 | bool | 13 | bool |
| 14 | 14 | ||
| 15 | # Platforms has a persistent clock | 15 | # Platforms has a persistent clock |
| 16 | config HAS_PERSISTENT_CLOCK | 16 | config ALWAYS_USE_PERSISTENT_CLOCK |
| 17 | bool | 17 | bool |
| 18 | default n | 18 | default n |
| 19 | 19 | ||