---

yaml --- r: 366187 b: refs/heads/master c: e408569 h: refs/heads/master i: 366185: 30da02f 366183: 556d810 v: v3
git-mirror · Apr 4, 2013 · 48f1be8 · 48f1be8
1 parent 1ab3bcf
commit 48f1be8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa6f9c595d857328e5d815e5b94c0e7cd31a6b59
+refs/heads/master: e4085693f629ded8ac8c35b5cdd324d20242990b
diff --git a/trunk/kernel/time/ntp.c b/trunk/kernel/time/ntp.c
@@ -668,11 +668,6 @@ int __do_adjtimex(struct timex *txc)
 	u32 time_tai, orig_tai;
 	int result;
 
-	/* Validate the data before disabling interrupts */
-	result = ntp_validate_timex(txc);
-	if (result)
-		return result;
-
 	if (txc->modes & ADJ_SETOFFSET) {
 		struct timespec delta;
 		delta.tv_sec  = txc->time.tv_sec;

diff --git a/trunk/kernel/time/ntp_internal.h b/trunk/kernel/time/ntp_internal.h
@@ -6,6 +6,7 @@ extern void ntp_clear(void);
 /* Returns how long ticks are at present, in ns / 2^NTP_SCALE_SHIFT. */
 extern u64 ntp_tick_length(void);
 extern int second_overflow(unsigned long secs);
+extern int ntp_validate_timex(struct timex *);
 extern int __do_adjtimex(struct timex *);
 extern void __hardpps(const struct timespec *, const struct timespec *);
 #endif /* _LINUX_NTP_INTERNAL_H */
diff --git a/trunk/kernel/time/timekeeping.c b/trunk/kernel/time/timekeeping.c
@@ -1618,6 +1618,13 @@ EXPORT_SYMBOL_GPL(ktime_get_monotonic_offset);
  */
 int do_adjtimex(struct timex *txc)
 {
+	int ret;
+
+	/* Validate the data before disabling interrupts */
+	ret = ntp_validate_timex(txc);
+	if (ret)
+		return ret;
+
 	return __do_adjtimex(txc);
 }