X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=drivers%2Fxen%2Fevents.c;h=6e075cdd0c6bf56ff8daacf986d443de23c49998;hb=daedd8708fe7707ed651bb1c83162f25c48a947c;hp=0eb8a57cc808e0d789c6f1477ba9d699297db377;hpb=6a6662ced4153f6dbcfc40d7225c3cc45416039c;p=mirror_ubuntu-zesty-kernel.git diff --git a/drivers/xen/events.c b/drivers/xen/events.c index 0eb8a57cc808..6e075cdd0c6b 100644 --- a/drivers/xen/events.c +++ b/drivers/xen/events.c @@ -85,8 +85,7 @@ enum xen_irq_type { * IPI - IPI vector * EVTCHN - */ -struct irq_info -{ +struct irq_info { struct list_head list; enum xen_irq_type type; /* type */ unsigned irq; @@ -282,9 +281,9 @@ static inline unsigned long active_evtchns(unsigned int cpu, struct shared_info *sh, unsigned int idx) { - return (sh->evtchn_pending[idx] & + return sh->evtchn_pending[idx] & per_cpu(cpu_evtchn_mask, cpu)[idx] & - ~sh->evtchn_mask[idx]); + ~sh->evtchn_mask[idx]; } static void bind_evtchn_to_cpu(unsigned int chn, unsigned int cpu) @@ -1180,7 +1179,7 @@ static void __xen_evtchn_do_upcall(void) int cpu = get_cpu(); struct shared_info *s = HYPERVISOR_shared_info; struct vcpu_info *vcpu_info = __this_cpu_read(xen_vcpu); - unsigned count; + unsigned count; do { unsigned long pending_words;