From: Boris Ostrovsky Date: Thu, 16 Oct 2014 21:02:15 +0000 (-0400) Subject: x86/xen: Fix incorrect per_cpu accessor in xen_clocksource_read() X-Git-Tag: v3.18-rc2~7^2~2 X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=3251f20b897f955ab7f153181b4ebfbb2317cbb9;p=cascardo%2Flinux.git x86/xen: Fix incorrect per_cpu accessor in xen_clocksource_read() Commit 89cbc76768c2 ("x86: Replace __get_cpu_var uses") replaced __get_cpu_var() with this_cpu_ptr() in xen_clocksource_read() in such a way that instead of accessing a structure pointed to by a per-cpu pointer we are trying to get to a per-cpu structure. __this_cpu_read() of the pointer is the more appropriate accessor. Signed-off-by: Boris Ostrovsky Signed-off-by: David Vrabel --- 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;