projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power...
[cascardo/linux.git]
/
arch
/
x86
/
kernel
/
pvclock.c
diff --git
a/arch/x86/kernel/pvclock.c
b/arch/x86/kernel/pvclock.c
index
3599404
..
5b2cc88
100644
(file)
--- a/
arch/x86/kernel/pvclock.c
+++ b/
arch/x86/kernel/pvclock.c
@@
-80,7
+80,7
@@
cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)
do {
version = pvclock_read_begin(src);
- ret = __pvclock_read_cycles(src);
+ ret = __pvclock_read_cycles(src
, rdtsc_ordered()
);
flags = src->flags;
} while (pvclock_read_retry(src, version));