diff options
author | john stultz <johnstul@us.ibm.com> | 2007-07-24 21:38:34 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-25 13:17:44 -0400 |
commit | 17c38b7490b3f0300c7812aefdae2ddda7ab4112 (patch) | |
tree | 0f7a9ee0c691aef3497030e38c3ba8e3c13a985c /kernel/hrtimer.c | |
parent | 2c6b47de17c75d553de3e2fb426d8298d2074585 (diff) |
Cache xtime every call to update_wall_time
This avoids xtime lag seen with dynticks, because while 'xtime' itself
is still not updated often, we keep a 'xtime_cache' variable around that
contains the approximate real-time that _is_ updated each time we do a
'update_wall_time()', and is thus never off by more than one tick.
IOW, this restores the original semantics for 'xtime' users, as long as
you use the proper abstraction functions (ie 'current_kernel_time()' or
'get_seconds()' depending on whether you want a timespec or just the
seconds field).
[ Updated Patch. As penance for my sins I've also yanked another #ifdef
that was added to avoid the xtime lag w/ hrtimers. ]
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 'kernel/hrtimer.c')
-rw-r--r-- | kernel/hrtimer.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index a7bb05e6cb63..c21ca6bfaa66 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c | |||
@@ -141,11 +141,7 @@ static void hrtimer_get_softirq_time(struct hrtimer_cpu_base *base) | |||
141 | 141 | ||
142 | do { | 142 | do { |
143 | seq = read_seqbegin(&xtime_lock); | 143 | seq = read_seqbegin(&xtime_lock); |
144 | #ifdef CONFIG_NO_HZ | ||
145 | getnstimeofday(&xts); | ||
146 | #else | ||
147 | xts = current_kernel_time(); | 144 | xts = current_kernel_time(); |
148 | #endif | ||
149 | tom = wall_to_monotonic; | 145 | tom = wall_to_monotonic; |
150 | } while (read_seqretry(&xtime_lock, seq)); | 146 | } while (read_seqretry(&xtime_lock, seq)); |
151 | 147 | ||