2012-11-20 03:06:25

by john stultz

[permalink] [raw]
Subject: [GIT PULL] time/clocksource changes for 3.8

Hey Thomas,
I wanted to send you just a few minor changes I have queued for
3.8. Let me know if you have any objections.

thanks
-john


The following changes since commit a1c2d60889d633ffecfa9f1f7ac0bdb474b7484e:

Merge branch 'drm-fixes' of
git://people.freedesktop.org/~airlied/linux (2012-11-09 21:35:51 +0100)

are available in the git repository at:

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

for you to fetch changes up to d6ad418763888f617ac5b4849823e4cd670df1dd:

time: Kill xtime_lock, replacing it with jiffies_lock (2012-11-13
14:08:23 -0500)

----------------------------------------------------------------
Dan Carpenter (1):
clocksource: clean up parse_pmtmr()

John Stultz (1):
time: Kill xtime_lock, replacing it with jiffies_lock

Lars-Peter Clausen (1):
time/jiffies: Make clocksource_jiffies static

Linus Walleij (1):
clocksource: arm_generic: use integer math helpers

Shan Wei (1):
clocksource: arm_generic: use this_cpu_ptr per-cpu helper

drivers/clocksource/acpi_pm.c | 17 ++++++++---------
drivers/clocksource/arm_generic.c | 6 +++---
drivers/clocksource/i8253.c | 2 +-
include/linux/jiffies.h | 3 ++-
kernel/time/jiffies.c | 8 +++++---
kernel/time/tick-common.c | 8 ++++----
kernel/time/tick-internal.h | 1 -
kernel/time/tick-sched.c | 22 +++++++++++-----------
kernel/time/timekeeping.c | 14 +++-----------
9 files changed, 37 insertions(+), 44 deletions(-)