Commit 6f16eebe authored by John Stultz's avatar John Stultz
Browse files

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: default avatarJohn Stultz <john.stultz@linaro.org>
parent e90c83f7

arch/x86/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/rtc/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -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

include/linux/time.h

+1 −1
Original line number Diff line number Diff line
@@ -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)

kernel/time/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE