From 2e0c2b29c6137ee58ea1a032b8fc4134cb2f1a56 Mon Sep 17 00:00:00 2001 From: John Stultz Date: Fri, 22 Mar 2013 14:20:03 -0700 Subject: [PATCH] --- yaml --- r: 366191 b: refs/heads/master c: 0b5154fb9040cca94e7d9893384c0e78bfe2d296 h: refs/heads/master i: 366189: 507d60df8bf1bdd39ee2945aa4e946759525f479 366187: 48f1be8b2581ebbac969294cdb3564dd5f92e7b7 366183: 556d81075674690a8065648bddf0800278a2dcae 366175: f8735b96d1cb85ba195107d28fd7e74a6cd74710 v: v3 --- [refs] | 2 +- trunk/kernel/time/timekeeping.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 812bf555e513..d1c61c73a14b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 06c017fdd4dc48451a29ac37fc1db4a3f86b7f40 +refs/heads/master: 0b5154fb9040cca94e7d9893384c0e78bfe2d296 diff --git a/trunk/kernel/time/timekeeping.c b/trunk/kernel/time/timekeeping.c index d10bd734b151..f93f60cd97ad 100644 --- a/trunk/kernel/time/timekeeping.c +++ b/trunk/kernel/time/timekeeping.c @@ -1618,9 +1618,10 @@ EXPORT_SYMBOL_GPL(ktime_get_monotonic_offset); */ int do_adjtimex(struct timex *txc) { + struct timekeeper *tk = &timekeeper; unsigned long flags; struct timespec ts; - s32 tai, orig_tai; + s32 tai; int ret; /* Validate the data before disabling interrupts */ @@ -1640,19 +1641,17 @@ int do_adjtimex(struct timex *txc) } getnstimeofday(&ts); - orig_tai = tai = timekeeping_get_tai_offset(); raw_spin_lock_irqsave(&timekeeper_lock, flags); write_seqcount_begin(&timekeeper_seq); + tai = tk->tai_offset; ret = __do_adjtimex(txc, &ts, &tai); + __timekeeping_set_tai_offset(tk, tai); write_seqcount_end(&timekeeper_seq); raw_spin_unlock_irqrestore(&timekeeper_lock, flags); - if (tai != orig_tai) - timekeeping_set_tai_offset(tai); - return ret; }