From 3e748dfd7ece288565e5a83e0dc0ff0c26da1087 Mon Sep 17 00:00:00 2001 From: Marcelo Tosatti Date: Tue, 27 Nov 2012 23:28:49 -0200 Subject: [PATCH] --- yaml --- r: 343532 b: refs/heads/master c: b01578de45614c085be319229a52774b61ffe6fb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/pvclock.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3d951228adff..7cf3a6862752 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7069ed67635b8d574541af426d752cd7fbd465a6 +refs/heads/master: b01578de45614c085be319229a52774b61ffe6fb diff --git a/trunk/arch/x86/kernel/pvclock.c b/trunk/arch/x86/kernel/pvclock.c index 42eb3300dfc6..12e47e210491 100644 --- a/trunk/arch/x86/kernel/pvclock.c +++ b/trunk/arch/x86/kernel/pvclock.c @@ -97,10 +97,10 @@ cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src) do { version = pvclock_get_time_values(&shadow, src); - barrier(); + rdtsc_barrier(); offset = pvclock_get_nsec_offset(&shadow); ret = shadow.system_timestamp + offset; - barrier(); + rdtsc_barrier(); } while (version != src->version); if ((valid_flags & PVCLOCK_TSC_STABLE_BIT) &&