From 65040f5cc8ad27b21005e01b25636a0c9631efda Mon Sep 17 00:00:00 2001 From: John Stultz Date: Fri, 25 Jan 2013 17:08:12 -0800 Subject: [PATCH] --- yaml --- r: 350167 b: refs/heads/master c: 6f16eebe1ff82176339a0439c98ebec9768b0ee2 h: refs/heads/master i: 350165: 7678443c4b3709e19cc83b671d79540b4b5e810c 350163: 585ca7254cdf4d6604ed726e0305524cfa5e3f4d 350159: 85f24f6c85435326b896987a9a9237bd86c1b22e v: v3 --- [refs] | 2 +- trunk/arch/x86/Kconfig | 2 +- trunk/drivers/rtc/Kconfig | 4 ++-- trunk/include/linux/time.h | 2 +- trunk/kernel/time/Kconfig | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index e3d11951cf50..2a2cebeecbb7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e90c83f757fffdacec8b3c5eee5617dcc038338f +refs/heads/master: 6f16eebe1ff82176339a0439c98ebec9768b0ee2 diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig index a4135b5e562e..335da90560e4 100644 --- a/trunk/arch/x86/Kconfig +++ b/trunk/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/trunk/drivers/rtc/Kconfig b/trunk/drivers/rtc/Kconfig index 05761de7929b..da60de01f732 100644 --- a/trunk/drivers/rtc/Kconfig +++ b/trunk/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/trunk/include/linux/time.h b/trunk/include/linux/time.h index 369b6e3b87d8..476e1d7b2c37 100644 --- a/trunk/include/linux/time.h +++ b/trunk/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/trunk/kernel/time/Kconfig b/trunk/kernel/time/Kconfig index f7e45b9b142b..0dddb9d09d0b 100644 --- a/trunk/kernel/time/Kconfig +++ b/trunk/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