Merge branch 'fortglx/3.9/time' of git://git.linaro.org/people/jstultz/linux into timers/core (90889a63) · Commits · 戴 / test

MAINTAINERS

+1 −1

Original line number	Diff line number	Diff line
		@@ -6598,7 +6598,7 @@ F: drivers/dma/dw_dmac_regs.h
		F: drivers/dma/dw_dmac.c

		TIMEKEEPING, NTP
		M: John Stultz <johnstul@us.ibm.com>
		M: John Stultz <john.stultz@linaro.org>
		M: Thomas Gleixner <tglx@linutronix.de>
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
		S: Supported

+1 −1

Original line number	Diff line number	Diff line
		@@ -668,7 +668,7 @@ int update_persistent_clock(struct timespec now)
		struct rtc_time tm;

		if (!ppc_md.set_rtc_time)
		return 0;
		return -ENODEV;

		to_tm(now.tv_sec + 1 + timezone_offset, &tm);
		tm.tm_year -= 1900;

+1 −0

Original line number	Diff line number	Diff line
		@@ -106,6 +106,7 @@ config X86
		select GENERIC_CLOCKEVENTS_BROADCAST if X86_64 \|\| (X86_32 && X86_LOCAL_APIC)
		select GENERIC_TIME_VSYSCALL if X86_64
		select KTIME_SCALAR if X86_32
		select ALWAYS_USE_PERSISTENT_CLOCK
		select GENERIC_STRNCPY_FROM_USER
		select GENERIC_STRNLEN_USER
		select HAVE_CONTEXT_TRACKING if X86_64

+2 −1

Original line number	Diff line number	Diff line
		@@ -623,7 +623,8 @@ static void set_cyc2ns_scale(unsigned long cpu_khz, int cpu)
		ns_now = __cycles_2_ns(tsc_now);

		if (cpu_khz) {
		*scale = (NSEC_PER_MSEC << CYC2NS_SCALE_FACTOR)/cpu_khz;
		*scale = ((NSEC_PER_MSEC << CYC2NS_SCALE_FACTOR) +
		cpu_khz / 2) / cpu_khz;
		offset = ns_now - mult_frac(tsc_now, scale,
		(1UL << CYC2NS_SCALE_FACTOR));
		}

+11 −1

Original line number	Diff line number	Diff line
		@@ -20,14 +20,24 @@ if RTC_CLASS
		config RTC_HCTOSYS
		bool "Set system time from RTC on startup and resume"
		default y
		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
		unnecessary fsck runs at boot time, and to network better.

		config RTC_SYSTOHC
		bool "Set the RTC time based on NTP synchronization"
		default y
		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
		minutes if userspace reports synchronized NTP status.

		config RTC_HCTOSYS_DEVICE
		string "RTC used to set the system time"
		depends on RTC_HCTOSYS = y
		depends on RTC_HCTOSYS = y \|\| RTC_SYSTOHC = y
		default "rtc0"
		help
		The RTC device that will be used to (re)initialize the system