From 507d60df8bf1bdd39ee2945aa4e946759525f479 Mon Sep 17 00:00:00 2001
From: John Stultz <john.stultz@linaro.org>
Date: Fri, 22 Mar 2013 15:04:13 -0700
Subject: [PATCH] --- yaml --- r: 366189 b: refs/heads/master c:
 cef90377fab488bd1f959efda178fb83250cf61d h: refs/heads/master i:   366187:
 48f1be8b2581ebbac969294cdb3564dd5f92e7b7 v: v3

---
 [refs]                          |  2 +-
 trunk/kernel/time/ntp.c         | 11 -----------
 trunk/kernel/time/timekeeping.c | 11 +++++++++++
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 694e8924acf2..0d7d95082f14 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87ace39b7168bd9d352c1c52b6f5d88eb1876cf8
+refs/heads/master: cef90377fab488bd1f959efda178fb83250cf61d
diff --git a/trunk/kernel/time/ntp.c b/trunk/kernel/time/ntp.c
index d17e13c0147d..a331ebc32e21 100644
--- a/trunk/kernel/time/ntp.c
+++ b/trunk/kernel/time/ntp.c
@@ -666,17 +666,6 @@ int __do_adjtimex(struct timex *txc, struct timespec *ts, s32 *time_tai)
 {
 	int result;
 
-	if (txc->modes & ADJ_SETOFFSET) {
-		struct timespec delta;
-		delta.tv_sec  = txc->time.tv_sec;
-		delta.tv_nsec = txc->time.tv_usec;
-		if (!(txc->modes & ADJ_NANO))
-			delta.tv_nsec *= 1000;
-		result = timekeeping_inject_offset(&delta);
-		if (result)
-			return result;
-	}
-
 	raw_spin_lock_irq(&ntp_lock);
 
 	if (txc->modes & ADJ_ADJTIME) {
diff --git a/trunk/kernel/time/timekeeping.c b/trunk/kernel/time/timekeeping.c
index 5f7a2330dc3c..e44915c7b16c 100644
--- a/trunk/kernel/time/timekeeping.c
+++ b/trunk/kernel/time/timekeeping.c
@@ -1627,6 +1627,17 @@ int do_adjtimex(struct timex *txc)
 	if (ret)
 		return ret;
 
+	if (txc->modes & ADJ_SETOFFSET) {
+		struct timespec delta;
+		delta.tv_sec  = txc->time.tv_sec;
+		delta.tv_nsec = txc->time.tv_usec;
+		if (!(txc->modes & ADJ_NANO))
+			delta.tv_nsec *= 1000;
+		ret = timekeeping_inject_offset(&delta);
+		if (ret)
+			return ret;
+	}
+
 	getnstimeofday(&ts);
 	orig_tai = tai = timekeeping_get_tai_offset();