Skip to contentSkip to conversation

Timekeeping changes for 3.9

GIT PULL John Stultz 1 participant 1 message Jan 22, 2013

lore
Share & tools
lore
#0 lore raw

Hey Thomas,
Here's my current queue I wanted to send to you in preparation for
3.9 (so they can have some time for testing in -next). There's also a few items that barely missed 3.8. Let me know if you have any issues with these.

thanks
-john

The following changes since commit 9c3f9e281697d02889c3b08922f3b30be75f56c2:

Merge branch 'fortglx/3.8/time' of
git://git.linaro.org/people/jstultz/linux into timers/core (2012-11-21 20:31:52 +0100)

are available in the git repository at:

git://git.linaro.org/people/jstultz/linux.git fortglx/3.9/time

for you to fetch changes up to e90c83f757fffdacec8b3c5eee5617dcc038338f:

x86: Select HAS_PERSISTENT_CLOCK on x86 (2013-01-15 18:16:09 -0800)

----------------------------------------------------------------
Bernd Faust (1):
Round the calculated scale factor in set_cyc2ns_scale()

Feng Tang (3):
timekeeping: Add persistent_clock_exist flag
rtc: Skip the suspend/resume handling if persistent clock exist
timekeeping: Add CONFIG_HAS_PERSISTENT_CLOCK option

Jason Gunthorpe (1):
NTP: Add a CONFIG_RTC_SYSTOHC configuration

John Stultz (2):
MAINTAINERS: Update John Stultz's email
x86: Select HAS_PERSISTENT_CLOCK on x86

Kees Cook (1):
time: create __getnstimeofday for WARNless calls

Miroslav Lichvar (1):
posix-timers: Fix clock_adjtime to always return timex data on
success

 MAINTAINERS                |    2 +-
 arch/powerpc/kernel/time.c |    2 +-
 arch/x86/Kconfig           |    1 +
 arch/x86/kernel/tsc.c      |    3 ++-
 drivers/rtc/Kconfig        |   12 +++++++++++-
 drivers/rtc/Makefile       |    1 +
 drivers/rtc/class.c        |    7 +++++++
 drivers/rtc/systohc.c      |   44 
+++++++++++++++++++++++++++++++++++++++++++
 fs/pstore/ram.c            |   10 +++++++---
 include/linux/rtc.h        |    1 +
 include/linux/time.h       |   12 ++++++++++++
 kernel/posix-timers.c      |    2 +-
 kernel/time/Kconfig        |    5 +++++
 kernel/time/ntp.c          |   16 ++++++++++++----
 kernel/time/timekeeping.c  |   45 
++++++++++++++++++++++++++++++++++----------
 15 files changed, 141 insertions(+), 22 deletions(-)
 create mode 100644 drivers/rtc/systohc.c