Commit 3251f20b authored Oct 16, 2014 by Boris Ostrovsky Committed by David Vrabel Oct 23, 2014

x86/xen: Fix incorrect per_cpu accessor in xen_clocksource_read()



Commit 89cbc767 ("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 <boris.ostrovsky@oracle.com>
Signed-off-by: David Vrabel <david.vrabel@citrix.com>

parent 3a0e94f8

arch/x86/xen/time.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

Admin message