diff options
author | Tony Breeds <tony@bakeyournoodle.com> | 2007-10-18 06:04:57 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-18 17:37:20 -0400 |
commit | 2c6221483169ddd4c04797cd7296ed4fe52fcdd7 (patch) | |
tree | 1db73f0bf60b036abe995350637a9a3e916c0ec2 /arch/ia64/kernel/time.c | |
parent | 6212e3a388fdda3f19fa660ef5a30edf54d1dcfd (diff) |
Fix discrepancy between VDSO based gettimeofday() and sys_gettimeofday().
On platforms that copy sys_tz into the vdso (currently only x86_64, soon to
include powerpc), it is possible for the vdso to get out of sync if a user
calls (admittedly unusual) settimeofday(NULL, ptr).
This patch adds a hook for architectures that set
CONFIG_GENERIC_TIME_VSYSCALL to ensure when sys_tz is updated they can also
updatee their copy in the vdso.
Signed-off-by: Tony Breeds <tony@bakeyournoodle.com>
Cc: Andi Kleen <ak@suse.de>
Cc: Tony Luck <tony.luck@intel.com>
Acked-by: John Stultz <johnstul@us.ibm.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/ia64/kernel/time.c')
-rw-r--r-- | arch/ia64/kernel/time.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c index 98cfc90cab1d..2bb84214e5f1 100644 --- a/arch/ia64/kernel/time.c +++ b/arch/ia64/kernel/time.c | |||
@@ -371,6 +371,11 @@ ia64_setup_printk_clock(void) | |||
371 | ia64_printk_clock = ia64_itc_printk_clock; | 371 | ia64_printk_clock = ia64_itc_printk_clock; |
372 | } | 372 | } |
373 | 373 | ||
374 | /* IA64 doesn't cache the timezone */ | ||
375 | void update_vsyscall_tz(void) | ||
376 | { | ||
377 | } | ||
378 | |||
374 | void update_vsyscall(struct timespec *wall, struct clocksource *c) | 379 | void update_vsyscall(struct timespec *wall, struct clocksource *c) |
375 | { | 380 | { |
376 | unsigned long flags; | 381 | unsigned long flags; |