diff options
author | John Stultz <john.stultz@linaro.org> | 2013-03-22 15:08:52 -0400 |
---|---|---|
committer | John Stultz <john.stultz@linaro.org> | 2013-04-04 16:18:14 -0400 |
commit | e4085693f629ded8ac8c35b5cdd324d20242990b (patch) | |
tree | 757707d15089ed0386b7f25bfa019cdfe9b44024 /kernel/time/ntp.c | |
parent | aa6f9c595d857328e5d815e5b94c0e7cd31a6b59 (diff) |
ntp: Move timex validation to timekeeping do_adjtimex call.
Move logic that does not need the ntp state to be done
in the timekeeping do_adjtimex() call.
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Prarit Bhargava <prarit@redhat.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'kernel/time/ntp.c')
-rw-r--r-- | kernel/time/ntp.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c index 8b107068d7e3..2dc60c6fe76b 100644 --- a/kernel/time/ntp.c +++ b/kernel/time/ntp.c | |||
@@ -668,11 +668,6 @@ int __do_adjtimex(struct timex *txc) | |||
668 | u32 time_tai, orig_tai; | 668 | u32 time_tai, orig_tai; |
669 | int result; | 669 | int result; |
670 | 670 | ||
671 | /* Validate the data before disabling interrupts */ | ||
672 | result = ntp_validate_timex(txc); | ||
673 | if (result) | ||
674 | return result; | ||
675 | |||
676 | if (txc->modes & ADJ_SETOFFSET) { | 671 | if (txc->modes & ADJ_SETOFFSET) { |
677 | struct timespec delta; | 672 | struct timespec delta; |
678 | delta.tv_sec = txc->time.tv_sec; | 673 | delta.tv_sec = txc->time.tv_sec; |