[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] linux-next: manual merge of the xen-tip tree with the tip tree
Hi all, Today's linux-next merge of the xen-tip tree got a conflict in drivers/xen/events/events_base.c between commit 02893afdd310 ("xen: Get rid of the last irq_desc abuse") from the tip tree and commit 8fb980538510 ("xen: add support for MSI message groups") from the xen-tip tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx diff --cc drivers/xen/events/events_base.c index c3458f58de90,793053065629..000000000000 --- a/drivers/xen/events/events_base.c +++ b/drivers/xen/events/events_base.c @@@ -767,7 -788,16 +776,12 @@@ int xen_destroy_irq(int irq mutex_lock(&irq_mapping_update_lock); - if (xen_initial_domain()) { - desc = irq_to_desc(irq); - if (!desc) - goto out; - + /* + * If trying to remove a vector in a MSI group different + * than the first one skip the PIRQ unmap unless this vector + * is the first one in the group. + */ + if (xen_initial_domain() && !(info->u.pirq.flags & PIRQ_MSI_GROUP)) { unmap_irq.pirq = info->u.pirq.pirq; unmap_irq.domid = info->u.pirq.domid; rc = HYPERVISOR_physdev_op(PHYSDEVOP_unmap_pirq, &unmap_irq); Attachment:
pgp7KMSMqYmtz.pgp _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |