summaryrefslogtreecommitdiff
path: root/kernel/timer.c
diff options
context:
space:
mode:
authorDaniel Walker <dwalker@mvista.com>2007-03-06 01:42:11 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-06 09:30:25 -0800
commit90675a27fa3eb0e97f1d040b183cceb44316e669 (patch)
treecf97bd53de877c12798368a4e06bba21285c0763 /kernel/timer.c
parent7a434814c7a6500b08bf4419ba8712b152d08d08 (diff)
downloadlinux-3.10-90675a27fa3eb0e97f1d040b183cceb44316e669.tar.gz
linux-3.10-90675a27fa3eb0e97f1d040b183cceb44316e669.tar.bz2
linux-3.10-90675a27fa3eb0e97f1d040b183cceb44316e669.zip
[PATCH] fix vsyscall settimeofday
I've only seen this on x86_64. The vsyscall state only gets updated when a timer interrupts comes in. So if the time is set long before the next timer, there will be a period when a gettimeofday() won't reflect the correct time. I added an explicit update_vsyscall() during the settimeofday(), that way the vsyscall state doesn't get stale. Signed-off-by: Daniel Walker <dwalker@mvista.com> Cc: Thomas Gleixner <tglx@linutronix.de> Acked-by: Ingo Molnar <mingo@elte.hu> Acked-by: John Stultz <johnstul@us.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/timer.c')
-rw-r--r--kernel/timer.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/timer.c b/kernel/timer.c
index ee0a2da4aab..797cccb8643 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -862,6 +862,8 @@ int do_settimeofday(struct timespec *tv)
clock->error = 0;
ntp_clear();
+ update_vsyscall(&xtime, clock);
+
write_sequnlock_irqrestore(&xtime_lock, flags);
/* signal hrtimers about time change */