Skip to contentSkip to conversation

Time stragglers for 3.4

GIT PULL John Stultz 1 participant 1 message Mar 24, 2012

lore
Share & tools
lore
#0 lore raw

Hey Thomas,
Here's the last of my items for 3.4. Let me know if you have any
objections or if you'd rather me push any changes off to 3.5.

thanks
-john

The changes can be found here, on top of tip/timers/core:

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

Andy Lutomirski (2):

x86-64: Simplify and optimize vdso clock_gettime monotonic variants

x86-64: Inline vdso clock_gettime helpers

Cesar Eduardo Barros (1):

time: remove no_sync_cmos_clock

Jim Cromie (1):

kernel-time: fix s/then/than/ spelling errors

John Stultz (3):

ntp: Fix leap-second hrtimer livelock

alarmtimer: Make sure we initialize the rtctimer

time: Avoid scary backtraces when warning of> 11% adj

 arch/x86/include/asm/vgtod.h   |   15 +++--
 arch/x86/kernel/vsyscall_64.c  |   10 +++-
 arch/x86/vdso/vclock_gettime.c |   47 ++++----------
 include/linux/time.h           |    1 -
 include/linux/timex.h          |    2 +-
 kernel/time/alarmtimer.c       |    5 +-
 kernel/time/clocksource.c      |    2 +-
 kernel/time/ntp.c              |  134 +++++++++++++---------------------------
 kernel/time/timekeeping.c      |   44 ++++++--------
 9 files changed, 98 insertions(+), 162 deletions(-)