Skip to contentSkip to conversation

Time/alarmtimer changes for 3.7

GIT PULL John Stultz 2 participants 3 messages Sep 24, 2012 – Sep 28, 2012

lore
Share & tools
lore
#0 lore raw

Hey Thomas, Ingo,
Here's my queue for 3.7 for tip/timers/core. Unfortunately
tip/timers/core is still 3.5 based, and this depends on items that landed in 3.6 (and that are waiting in tip/timers/urgent), so its based off of tip/timers/urgent, but merges cleanly with tip/timers/core.

Let me know if you have any thoughts or requests for changes here.

thanks
-john

PS: Just a reminder that there is still a pending change in tip/timers/urgent that I'd hope to get into 3.6.

The following changes since commit ec145babe754f9ea1079034a108104b6001e001c:

time: Fix timeekeping_get_ns overflow on 32bit systems (2012-09-13 17:39:14 +0200)

are available in the git repository at:

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

for you to fetch changes up to 650ea02475106e8d6bdf561896d2ffe0d1c0ebb4:

time: Convert x86_64 to using new update_vsyscall (2012-09-24 12:38:09 -0400)

----------------------------------------------------------------
John Stultz (11):
alarmtimer: Use hrtimer per-alarm instead of per-base
alarmtimer: Remove unused helpers & defines
alarmtimer: Rename alarmtimer_remove to alarmtimer_dequeue
jiffies: Kill unused TICK_USEC_TO_NSEC
jiffies: Remove compile time assumptions about CLOCK_TICK_RATE
time: Move timekeeper structure to timekeeper_internal.h for vsyscall changes
time: Move update_vsyscall definitions to timekeeper_internal.h
time: Convert CONFIG_GENERIC_TIME_VSYSCALL to CONFIG_GENERIC_TIME_VSYSCALL_OLD
time: Introduce new GENERIC_TIME_VSYSCALL
time: Only do nanosecond rounding on GENERIC_TIME_VSYSCALL_OLD systems
time: Convert x86_64 to using new update_vsyscall

Todd Poynor (1):
alarmtimer: Implement minimum alarm interval for allowing suspend

 arch/ia64/Kconfig                   |    2 +-
 arch/ia64/kernel/time.c             |    4 +-
 arch/powerpc/Kconfig                |    2 +-
 arch/powerpc/kernel/time.c          |    4 +-
 arch/s390/Kconfig                   |    2 +-
 arch/s390/kernel/time.c             |    4 +-
 arch/x86/include/asm/vgtod.h        |    4 +-
 arch/x86/kernel/setup.c             |    3 +
 arch/x86/kernel/vsyscall_64.c       |   49 +++++++++------
 arch/x86/vdso/vclock_gettime.c      |   22 ++++---
 include/linux/alarmtimer.h          |   31 +--------
 include/linux/clocksource.h         |   16 -----
 include/linux/jiffies.h             |   21 +------
 include/linux/timekeeper_internal.h |  108 ++++++++++++++++++++++++++++++++
 kernel/time.c                       |    2 +-
 kernel/time/Kconfig                 |    4 ++
 kernel/time/alarmtimer.c            |  118 +++++++++++++----------------------
 kernel/time/jiffies.c               |   32 +++++++++-
 kernel/time/timekeeping.c           |  115 ++++++++++------------------------
 19 files changed, 281 insertions(+), 262 deletions(-)
 create mode 100644 include/linux/timekeeper_internal.h
#1 lore raw
Quoted 1 line · John Stultz

Hey Thomas, Ingo,

[snip]

Quoted 2 lines

PS: Just a reminder that there is still a pending change in tip/timers/urgent that I'd hope to get into 3.6.

Oh, ignore that. Just updated my tree and it looks like it landed over the weekend.

Sorry for the noise.
-john

#2 lore raw
In reply to John Stultz

Hey Thomas,
I just updated my fortglx/3.7/time branch to include and resolve
the collision with Arnd's LATCH fix. Just wanted to give you a heads up so you weren't surprised by the additional change.

Full pull request below.

thanks
-john

The following changes since commit ec145babe754f9ea1079034a108104b6001e001c:

time: Fix timeekeping_get_ns overflow on 32bit systems (2012-09-13 17:39:14 +0200)

are available in the git repository at:

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

for you to fetch changes up to 28f2b02bc581ffc835bc1691b18d03f62fcf0395:

Merge branch 'arnds-jiffies-fix' into fortglx/3.7/time (2012-09-28 18:00:27 -0400)

----------------------------------------------------------------

Arnd Bergmann (1):
time/jiffies: bring back unconditional LATCH definition

John Stultz (12):
alarmtimer: Use hrtimer per-alarm instead of per-base
alarmtimer: Remove unused helpers & defines
alarmtimer: Rename alarmtimer_remove to alarmtimer_dequeue
jiffies: Kill unused TICK_USEC_TO_NSEC
jiffies: Remove compile time assumptions about CLOCK_TICK_RATE
time: Move timekeeper structure to timekeeper_internal.h for vsyscall changes
time: Move update_vsyscall definitions to timekeeper_internal.h
time: Convert CONFIG_GENERIC_TIME_VSYSCALL to CONFIG_GENERIC_TIME_VSYSCALL_OLD
time: Introduce new GENERIC_TIME_VSYSCALL
time: Only do nanosecond rounding on GENERIC_TIME_VSYSCALL_OLD systems
time: Convert x86_64 to using new update_vsyscall
Merge branch 'arnds-jiffies-fix' into fortglx/3.7/time

Todd Poynor (1):
alarmtimer: Implement minimum alarm interval for allowing suspend

 arch/ia64/Kconfig                   |    2 +-
 arch/ia64/kernel/time.c             |    4 +-
 arch/powerpc/Kconfig                |    2 +-
 arch/powerpc/kernel/time.c          |    4 +-
 arch/s390/Kconfig                   |    2 +-
 arch/s390/kernel/time.c             |    4 +-
 arch/x86/include/asm/vgtod.h        |    4 +-
 arch/x86/kernel/setup.c             |    3 +
 arch/x86/kernel/vsyscall_64.c       |   49 +++++++++------
 arch/x86/vdso/vclock_gettime.c      |   22 ++++---
 include/linux/alarmtimer.h          |   31 +--------
 include/linux/clocksource.h         |   16 -----
 include/linux/jiffies.h             |   20 +-----
 include/linux/timekeeper_internal.h |  108 ++++++++++++++++++++++++++++++++
 kernel/time.c                       |    2 +-
 kernel/time/Kconfig                 |    4 ++
 kernel/time/alarmtimer.c            |  118 +++++++++++++----------------------
 kernel/time/jiffies.c               |   32 +++++++++-
 kernel/time/timekeeping.c           |  115 ++++++++++------------------------
 19 files changed, 282 insertions(+), 260 deletions(-)
 create mode 100644 include/linux/timekeeper_internal.h