git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
kernel
/
vsyscall_64.c
diff --git
a/arch/x86/kernel/vsyscall_64.c
b/arch/x86/kernel/vsyscall_64.c
index 6f3d3d4cd97338162e6889f4eaae86b744f2a2ab..25ee06a80aad3cd116292227826f9a32fa4b3f7a 100644
(file)
--- a/
arch/x86/kernel/vsyscall_64.c
+++ b/
arch/x86/kernel/vsyscall_64.c
@@
-131,6
+131,7
@@
static __always_inline void do_vgettimeofday(struct timeval * tv)
gettimeofday(tv,NULL);
return;
}
+
now = vread();
base = __vsyscall_gtod_data.clock.cycle_last;
mask = __vsyscall_gtod_data.clock.mask;