diff options
Diffstat (limited to 'arch/x86/xen/irq.c')
-rw-r--r-- | arch/x86/xen/irq.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/xen/irq.c b/arch/x86/xen/irq.c index 8bbb465b6f0a..157337657971 100644 --- a/arch/x86/xen/irq.c +++ b/arch/x86/xen/irq.c | |||
@@ -26,7 +26,7 @@ static unsigned long xen_save_fl(void) | |||
26 | struct vcpu_info *vcpu; | 26 | struct vcpu_info *vcpu; |
27 | unsigned long flags; | 27 | unsigned long flags; |
28 | 28 | ||
29 | vcpu = percpu_read(xen_vcpu); | 29 | vcpu = this_cpu_read(xen_vcpu); |
30 | 30 | ||
31 | /* flag has opposite sense of mask */ | 31 | /* flag has opposite sense of mask */ |
32 | flags = !vcpu->evtchn_upcall_mask; | 32 | flags = !vcpu->evtchn_upcall_mask; |
@@ -50,7 +50,7 @@ static void xen_restore_fl(unsigned long flags) | |||
50 | make sure we're don't switch CPUs between getting the vcpu | 50 | make sure we're don't switch CPUs between getting the vcpu |
51 | pointer and updating the mask. */ | 51 | pointer and updating the mask. */ |
52 | preempt_disable(); | 52 | preempt_disable(); |
53 | vcpu = percpu_read(xen_vcpu); | 53 | vcpu = this_cpu_read(xen_vcpu); |
54 | vcpu->evtchn_upcall_mask = flags; | 54 | vcpu->evtchn_upcall_mask = flags; |
55 | preempt_enable_no_resched(); | 55 | preempt_enable_no_resched(); |
56 | 56 | ||
@@ -72,7 +72,7 @@ static void xen_irq_disable(void) | |||
72 | make sure we're don't switch CPUs between getting the vcpu | 72 | make sure we're don't switch CPUs between getting the vcpu |
73 | pointer and updating the mask. */ | 73 | pointer and updating the mask. */ |
74 | preempt_disable(); | 74 | preempt_disable(); |
75 | percpu_read(xen_vcpu)->evtchn_upcall_mask = 1; | 75 | this_cpu_read(xen_vcpu)->evtchn_upcall_mask = 1; |
76 | preempt_enable_no_resched(); | 76 | preempt_enable_no_resched(); |
77 | } | 77 | } |
78 | PV_CALLEE_SAVE_REGS_THUNK(xen_irq_disable); | 78 | PV_CALLEE_SAVE_REGS_THUNK(xen_irq_disable); |
@@ -86,7 +86,7 @@ static void xen_irq_enable(void) | |||
86 | the caller is confused and is trying to re-enable interrupts | 86 | the caller is confused and is trying to re-enable interrupts |
87 | on an indeterminate processor. */ | 87 | on an indeterminate processor. */ |
88 | 88 | ||
89 | vcpu = percpu_read(xen_vcpu); | 89 | vcpu = this_cpu_read(xen_vcpu); |
90 | vcpu->evtchn_upcall_mask = 0; | 90 | vcpu->evtchn_upcall_mask = 0; |
91 | 91 | ||
92 | /* Doesn't matter if we get preempted here, because any | 92 | /* Doesn't matter if we get preempted here, because any |