提交 7e1b5847 编写于 作者: J John Stultz 提交者: Thomas Gleixner

ntp: Cleanup xtime references in ntp.c

ntp.c doesn't need to access timekeeping internals directly, so change
xtime references to use the get_seconds() timekeeping interface.
Signed-off-by: NJohn Stultz <johnstul@us.ibm.com>
Cc: richard@rsk.demon.co.uk
LKML-Reference: <1264738844-21935-1-git-send-email-johnstul@us.ibm.com>
Signed-off-by: NThomas Gleixner <tglx@linutronix.de>
上级 1f5b8f8a
...@@ -142,11 +142,11 @@ static void ntp_update_offset(long offset) ...@@ -142,11 +142,11 @@ static void ntp_update_offset(long offset)
* Select how the frequency is to be controlled * Select how the frequency is to be controlled
* and in which mode (PLL or FLL). * and in which mode (PLL or FLL).
*/ */
secs = xtime.tv_sec - time_reftime; secs = get_seconds() - time_reftime;
if (unlikely(time_status & STA_FREQHOLD)) if (unlikely(time_status & STA_FREQHOLD))
secs = 0; secs = 0;
time_reftime = xtime.tv_sec; time_reftime = get_seconds();
offset64 = offset; offset64 = offset;
freq_adj = (offset64 * secs) << freq_adj = (offset64 * secs) <<
...@@ -368,7 +368,7 @@ static inline void process_adj_status(struct timex *txc, struct timespec *ts) ...@@ -368,7 +368,7 @@ static inline void process_adj_status(struct timex *txc, struct timespec *ts)
* reference time to current time. * reference time to current time.
*/ */
if (!(time_status & STA_PLL) && (txc->status & STA_PLL)) if (!(time_status & STA_PLL) && (txc->status & STA_PLL))
time_reftime = xtime.tv_sec; time_reftime = get_seconds();
/* only set allowed bits */ /* only set allowed bits */
time_status &= STA_RONLY; time_status &= STA_RONLY;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册