aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/xen/events.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index da70f5c32eb9..8876ffd08771 100644
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -85,8 +85,7 @@ enum xen_irq_type {
85 * IPI - IPI vector 85 * IPI - IPI vector
86 * EVTCHN - 86 * EVTCHN -
87 */ 87 */
88struct irq_info 88struct irq_info {
89{
90 struct list_head list; 89 struct list_head list;
91 enum xen_irq_type type; /* type */ 90 enum xen_irq_type type; /* type */
92 unsigned irq; 91 unsigned irq;
@@ -282,9 +281,9 @@ static inline unsigned long active_evtchns(unsigned int cpu,
282 struct shared_info *sh, 281 struct shared_info *sh,
283 unsigned int idx) 282 unsigned int idx)
284{ 283{
285 return (sh->evtchn_pending[idx] & 284 return sh->evtchn_pending[idx] &
286 per_cpu(cpu_evtchn_mask, cpu)[idx] & 285 per_cpu(cpu_evtchn_mask, cpu)[idx] &
287 ~sh->evtchn_mask[idx]); 286 ~sh->evtchn_mask[idx];
288} 287}
289 288
290static void bind_evtchn_to_cpu(unsigned int chn, unsigned int cpu) 289static void bind_evtchn_to_cpu(unsigned int chn, unsigned int cpu)
@@ -1152,7 +1151,7 @@ static void __xen_evtchn_do_upcall(void)
1152 int cpu = get_cpu(); 1151 int cpu = get_cpu();
1153 struct shared_info *s = HYPERVISOR_shared_info; 1152 struct shared_info *s = HYPERVISOR_shared_info;
1154 struct vcpu_info *vcpu_info = __this_cpu_read(xen_vcpu); 1153 struct vcpu_info *vcpu_info = __this_cpu_read(xen_vcpu);
1155 unsigned count; 1154 unsigned count;
1156 1155
1157 do { 1156 do {
1158 unsigned long pending_words; 1157 unsigned long pending_words;