git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'cpu_stop' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc...
[safe/jmp/linux-2.6]
/
arch
/
s390
/
kernel
/
time.c
diff --git
a/arch/s390/kernel/time.c
b/arch/s390/kernel/time.c
index
03d9656
..
a2163c9
100644
(file)
--- a/
arch/s390/kernel/time.c
+++ b/
arch/s390/kernel/time.c
@@
-221,6
+221,7
@@
void update_vsyscall(struct timespec *wall_time, struct clocksource *clock,
vdso_data->xtime_clock_nsec = wall_time->tv_nsec;
vdso_data->wtom_clock_sec = wall_to_monotonic.tv_sec;
vdso_data->wtom_clock_nsec = wall_to_monotonic.tv_nsec;
+ vdso_data->ntp_mult = mult;
smp_wmb();
++vdso_data->tb_update_count;
}