public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH 0/3] Cleanup ADJ_SETOFFSET patch
@ 2010-12-27 23:40 John Stultz
  2010-12-27 23:40 ` [PATCH 1/3] time: Introduce timekeeping_inject_offset John Stultz
                   ` (3 more replies)
  0 siblings, 4 replies; 14+ messages in thread
From: John Stultz @ 2010-12-27 23:40 UTC (permalink / raw)
  To: linux-kernel; +Cc: John Stultz, Richard Cochran, Thomas Gleixner

I was looking to queue Richard's ADJ_SETOFFSET patch to see
if it could be merged into -tip for 2.6.38, but on second 
glance I noticed the ugly local_irq_disable bits as well
as the fact that adding the offset uses a gettime/add/settime
pattern which will also add a small error as the action isn't
atomic.

So I implemented a timekeeping function to add a fixed offset:
timekeeping_inject_offset(), and reworked Richard's code to
make use of it.

Richard: Any objection here? Mind testing this with the rest
of your patch queue?

Thomas: Any comments? Does this seem reasonable for 2.6.38? 
Should I fold my cleanups into Richard's patch?

thanks
-john


CC: Richard Cochran <richard.cochran@omicron.at>
CC: Thomas Gleixner <tglx@linutronix.de>

John Stultz (2):
  time: Introduce timekeeping_inject_offset
  ntp: Change ADJ_SETOFFSET implementation to use
    timekeeping_inject_offset

Richard Cochran (1):
  ntp: add ADJ_SETOFFSET mode bit

 include/linux/time.h      |    1 +
 include/linux/timex.h     |    3 ++-
 kernel/time/ntp.c         |   13 +++++++++++++
 kernel/time/timekeeping.c |   36 ++++++++++++++++++++++++++++++++++++
 4 files changed, 52 insertions(+), 1 deletions(-)

-- 
1.7.3.2.146.gca209


^ permalink raw reply	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2011-01-05  7:00 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-27 23:40 [PATCH 0/3] Cleanup ADJ_SETOFFSET patch John Stultz
2010-12-27 23:40 ` [PATCH 1/3] time: Introduce timekeeping_inject_offset John Stultz
2010-12-27 23:40 ` [PATCH 2/3] ntp: add ADJ_SETOFFSET mode bit John Stultz
2010-12-28 20:47   ` Kuwahara,T.
2011-01-03 20:44     ` John Stultz
2011-01-04  8:37       ` Richard Cochran
2011-01-04 19:08         ` John Stultz
     [not found]           ` <12d52d09b05.7801197194177918524.-8125715123212004756@gmail.com>
2011-01-05  7:00             ` Richard Cochran
2011-01-04  8:40       ` Richard Cochran
2011-01-04 19:14         ` John Stultz
2010-12-27 23:40 ` [PATCH 3/3] ntp: Change ADJ_SETOFFSET implementation to use timekeeping_inject_offset John Stultz
2010-12-28 11:20 ` [PATCH 0/3] Cleanup ADJ_SETOFFSET patch Richard Cochran
2010-12-28 12:53   ` Richard Cochran
2010-12-28 13:36     ` Richard Cochran

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox