Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 6f16eebe1ff82176339a0439c98ebec9768b0ee2

Authored by John Stultz
1 parent e90c83f757
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

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>

Showing 4 changed files with 5 additions and 5 deletions Side-by-side Diff

... ... @@ -108,7 +108,7 @@
108 108 select GENERIC_STRNLEN_USER
109 109 select HAVE_RCU_USER_QS if X86_64
110 110 select HAVE_IRQ_TIME_ACCOUNTING
111   - select HAS_PERSISTENT_CLOCK
  111 + select ALWAYS_USE_PERSISTENT_CLOCK
112 112 select GENERIC_KERNEL_THREAD
113 113 select GENERIC_KERNEL_EXECVE
114 114 select MODULES_USE_ELF_REL if X86_32
... ... @@ -20,7 +20,7 @@
20 20 config RTC_HCTOSYS
21 21 bool "Set system time from RTC on startup and resume"
22 22 default y
23   - depends on !HAS_PERSISTENT_CLOCK
  23 + depends on !ALWAYS_USE_PERSISTENT_CLOCK
24 24 help
25 25 If you say yes here, the system time (wall clock) will be set using
26 26 the value read from a specified RTC device. This is useful to avoid
... ... @@ -29,7 +29,7 @@
29 29 config RTC_SYSTOHC
30 30 bool "Set the RTC time based on NTP synchronization"
31 31 default y
32   - depends on !HAS_PERSISTENT_CLOCK
  32 + depends on !ALWAYS_USE_PERSISTENT_CLOCK
33 33 help
34 34 If you say yes here, the system time (wall clock) will be stored
35 35 in the RTC specified by RTC_HCTOSYS_DEVICE approximately every 11
include/linux/time.h
Diff comments   View file @ 6f16eeb
... ... @@ -117,7 +117,7 @@
117 117  
118 118 extern bool persistent_clock_exist;
119 119  
120   -#ifdef CONFIG_HAS_PERSISTENT_CLOCK
  120 +#ifdef ALWAYS_USE_PERSISTENT_CLOCK
121 121 #define has_persistent_clock() true
122 122 #else
123 123 static inline bool has_persistent_clock(void)
... ... @@ -13,7 +13,7 @@
13 13 bool
14 14  
15 15 # Platforms has a persistent clock
16   -config HAS_PERSISTENT_CLOCK
  16 +config ALWAYS_USE_PERSISTENT_CLOCK
17 17 bool
18 18 default n
19 19