Commit-ID: 0b5154fb9040cca94e7d9893384c0e78bfe2d296
Gitweb: http://git.kernel.org/tip/0b5154fb9040cca94e7d9893384c0e78bfe2d296
Author: John Stultz <john.stultz@xxxxxxxxxx>
AuthorDate: Fri, 22 Mar 2013 14:20:03 -0700
Committer: John Stultz <john.stultz@xxxxxxxxxx>
CommitDate: Thu, 4 Apr 2013 13:18:16 -0700
timekeeping: Simplify tai updating from do_adjtimex
Since we are taking the timekeeping locks, just go ahead
and update any tai change directly, rather then dropping
the lock and calling a function that will just take it again.
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Richard Cochran <richardcochran@xxxxxxxxx>
Cc: Prarit Bhargava <prarit@xxxxxxxxxx>
Signed-off-by: John Stultz <john.stultz@xxxxxxxxxx>
---
kernel/time/timekeeping.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index d10bd73..f93f60c 100644
--- a/kernel/time/timekeeping.c
+++ b/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;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|