diff options
| author |   John Stultz <john.stultz@linaro.org> | 2013-03-22 12:08:52 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2013-04-04 13:18:14 -0700 |
| commit | e4085693f629ded8ac8c35b5cdd324d20242990b (patch) | |
| tree | 757707d15089ed0386b7f25bfa019cdfe9b44024 /kernel/time/ntp.c | |
| parent | ntp: Move do_adjtimex() and hardpps() functions to timekeeping.c (diff) | |
| download | linux-dev-e4085693f629ded8ac8c35b5cdd324d20242990b.tar.xz linux-dev-e4085693f629ded8ac8c35b5cdd324d20242990b.zip | |
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) 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; |