Merge branch 'perf/urgent' into perf/core, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c
index a1d430b112b3..f473d268d387 100644
--- a/arch/x86/xen/time.c
+++ b/arch/x86/xen/time.c
@@ -158,7 +158,7 @@ cycle_t xen_clocksource_read(void)
         cycle_t ret;
 
         preempt_disable_notrace();
-        src = this_cpu_ptr(&xen_vcpu->time);
+        src = &__this_cpu_read(xen_vcpu)->time;
         ret = pvclock_clocksource_read(src);
         preempt_enable_notrace();
         return ret;