diff options
author | john stultz <johnstul@us.ibm.com> | 2007-07-24 20:47:43 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-25 13:09:20 -0400 |
commit | 2c6b47de17c75d553de3e2fb426d8298d2074585 (patch) | |
tree | c8edc3d727d85cb3e1c043583c350a04a133e1a3 /drivers/rtc | |
parent | 0de085bb474f64e4fdb2f1ff3268590792648c7b (diff) |
Cleanup non-arch xtime uses, use get_seconds() or current_kernel_time().
This avoids use of the kernel-internal "xtime" variable directly outside
of the actual time-related functions. Instead, use the helper functions
that we already have available to us.
This doesn't actually change any behaviour, but this will allow us to
fix the fact that "xtime" isn't updated very often with CONFIG_NO_HZ
(because much of the realtime information is maintained as separate
offsets to 'xtime'), which has caused interfaces that use xtime directly
to get a time that is out of sync with the real-time clock by up to a
third of a second or so.
Signed-off-by: John Stultz <johnstul@us.ibm.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/rtc')
-rw-r--r-- | drivers/rtc/class.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/rtc/class.c b/drivers/rtc/class.c index 8b3cd31d6a61..10ab3b71ffc6 100644 --- a/drivers/rtc/class.c +++ b/drivers/rtc/class.c | |||
@@ -46,6 +46,7 @@ static int rtc_suspend(struct device *dev, pm_message_t mesg) | |||
46 | { | 46 | { |
47 | struct rtc_device *rtc = to_rtc_device(dev); | 47 | struct rtc_device *rtc = to_rtc_device(dev); |
48 | struct rtc_time tm; | 48 | struct rtc_time tm; |
49 | struct timespec ts = current_kernel_time(); | ||
49 | 50 | ||
50 | if (strncmp(rtc->dev.bus_id, | 51 | if (strncmp(rtc->dev.bus_id, |
51 | CONFIG_RTC_HCTOSYS_DEVICE, | 52 | CONFIG_RTC_HCTOSYS_DEVICE, |
@@ -57,8 +58,8 @@ static int rtc_suspend(struct device *dev, pm_message_t mesg) | |||
57 | 58 | ||
58 | /* RTC precision is 1 second; adjust delta for avg 1/2 sec err */ | 59 | /* RTC precision is 1 second; adjust delta for avg 1/2 sec err */ |
59 | set_normalized_timespec(&delta, | 60 | set_normalized_timespec(&delta, |
60 | xtime.tv_sec - oldtime, | 61 | ts.tv_sec - oldtime, |
61 | xtime.tv_nsec - (NSEC_PER_SEC >> 1)); | 62 | ts.tv_nsec - (NSEC_PER_SEC >> 1)); |
62 | 63 | ||
63 | return 0; | 64 | return 0; |
64 | } | 65 | } |