public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: John Stultz <john.stultz@linaro.org>
To: Thomas Gleixner <tglx@linutronix.de>
Cc: lkml <linux-kernel@vger.kernel.org>,
	Prarit Bhargava <prarit@redhat.com>,
	David Engraf <david.engraf@sysgo.com>
Subject: [GIT PULL] Timekeeping locking changes for 3.10
Date: Mon, 08 Apr 2013 20:39:05 -0700	[thread overview]
Message-ID: <51638D59.6010305@linaro.org> (raw)

Hey Thomas,
     Here's the second chunk of my 3.10 timekeeping changes.

This queue includes:
* NTP locking changes needed for your shadow-timekeeping work
* Your shadow-timekeeping work
* hrtimer fixes from David and Prarit (also tagged for stable)

Let me know if you have any comments or objections!
thanks
-john


The following changes since commit 0ed2aef9b3bffe598045b62a31a50d912eee92d8:

   Merge branch 'fortglx/3.10/time' of 
git://git.linaro.org/people/jstultz/linux into timers/core (2013-04-03 
12:27:29 +0200)

are available in the git repository at:


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

for you to fetch changes up to 51fd36f3fad8447c487137ae26b9d0b3ce77bb25:

   hrtimer: Fix ktime_add_ns() overflow on 32bit architectures 
(2013-04-08 13:21:20 -0700)

----------------------------------------------------------------
David Engraf (1):
       hrtimer: Fix ktime_add_ns() overflow on 32bit architectures

John Stultz (8):
       ntp: Split out timex validation from do_adjtimex
       ntp: Move do_adjtimex() and hardpps() functions to timekeeping.c
       ntp: Move timex validation to timekeeping do_adjtimex call.
       ntp: Rework do_adjtimex to take timespec and tai arguments
       timekeeping: Move ADJ_SETOFFSET to top level do_adjtimex()
       timekeeping: Hold timekeepering locks in do_adjtimex and hardpps
       timekeeping: Simplify tai updating from do_adjtimex
       ntp: Remove ntp_lock, using the timekeeping locks to protect ntp 
state

Prarit Bhargava (1):
       hrtimer: Add expiry time overflow check in hrtimer_interrupt

Thomas Gleixner (4):
       timekeeping: Store cycle_last value in timekeeper struct as well
       timekeeping: Delay update of clock->cycle_last
       timekeeping: Implement a shadow timekeeper
       timekeeping: Shorten seq_count region

  include/linux/timekeeper_internal.h |    2 +
  include/linux/timex.h               |    7 --
  kernel/hrtimer.c                    |    6 ++
  kernel/time/ntp.c                   |   99 ++++++++---------------------
  kernel/time/ntp_internal.h          |   12 ++++
  kernel/time/timekeeping.c           |  120 
+++++++++++++++++++++++++++++------
  6 files changed, 148 insertions(+), 98 deletions(-)
  create mode 100644 kernel/time/ntp_internal.h

                 reply	other threads:[~2013-04-09  3:39 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=51638D59.6010305@linaro.org \
    --to=john.stultz@linaro.org \
    --cc=david.engraf@sysgo.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=prarit@redhat.com \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox