1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index 3df7e477694a..74681478100a 100644
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -358,7 +358,7 @@ static void unmask_evtchn(int port)
                 struct evtchn_unmask unmask = { .port = port };
                 (void)HYPERVISOR_event_channel_op(EVTCHNOP_unmask, &unmask);
         } else {
-                struct vcpu_info *vcpu_info = __get_cpu_var(xen_vcpu);
+                struct vcpu_info *vcpu_info = __this_cpu_read(xen_vcpu);
 
                 sync_clear_bit(port, &s->evtchn_mask[0]);
 
@@ -1110,7 +1110,7 @@ static void __xen_evtchn_do_upcall(void)
 {
         int cpu = get_cpu();
         struct shared_info *s = HYPERVISOR_shared_info;
-        struct vcpu_info *vcpu_info = __get_cpu_var(xen_vcpu);
+        struct vcpu_info *vcpu_info = __this_cpu_read(xen_vcpu);
         unsigned count;
 
         do {
@@ -1118,7 +1118,7 @@ static void __xen_evtchn_do_upcall(void)
 
                 vcpu_info->evtchn_upcall_pending = 0;
 
-                if (__get_cpu_var(xed_nesting_count)++)
+                if (__this_cpu_inc_return(xed_nesting_count) - 1)
                         goto out;
 
 #ifndef CONFIG_X86 /* No need for a barrier -- XCHG is a barrier on x86. */
@@ -1150,8 +1150,8 @@ static void __xen_evtchn_do_upcall(void)
 
                 BUG_ON(!irqs_disabled());
 
-                count = __get_cpu_var(xed_nesting_count);
-                __get_cpu_var(xed_nesting_count) = 0;
+                count = __this_cpu_read(xed_nesting_count);
+                __this_cpu_write(xed_nesting_count, 0);
         } while (count != 1 || vcpu_info->evtchn_upcall_pending);
 
 out: