1 files changed, 4 insertions, 9 deletions

diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index aa85881d17b2..bb65f75e40a5 100644
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -85,8 +85,7 @@ enum xen_irq_type {
  * event channel - irq->event channel mapping
  * cpu - cpu this event channel is bound to
  * index - type-specific information:
- *    PIRQ - vector, with MSB being "needs EIO", or physical IRQ of the HVM
- *           guest, or GSI (real passthrough IRQ) of the device.
+ *    PIRQ - physical IRQ, GSI, flags, and owner domain
  *    VIRQ - virq number
  *    IPI - IPI vector
  *    EVTCHN -
@@ -105,7 +104,6 @@ struct irq_info {
                 struct {
                         unsigned short pirq;
                         unsigned short gsi;
-                        unsigned char vector;
                         unsigned char flags;
                         uint16_t domid;
                 } pirq;
@@ -211,7 +209,6 @@ static void xen_irq_info_pirq_init(unsigned irq,
                                    unsigned short evtchn,
                                    unsigned short pirq,
                                    unsigned short gsi,
-                                   unsigned short vector,
                                    uint16_t domid,
                                    unsigned char flags)
 {
@@ -221,7 +218,6 @@ static void xen_irq_info_pirq_init(unsigned irq,
 
         info->u.pirq.pirq = pirq;
         info->u.pirq.gsi = gsi;
-        info->u.pirq.vector = vector;
         info->u.pirq.domid = domid;
         info->u.pirq.flags = flags;
 }
@@ -714,7 +710,7 @@ int xen_bind_pirq_gsi_to_irq(unsigned gsi,
                 goto out;
         }
 
-        xen_irq_info_pirq_init(irq, 0, pirq, gsi, irq_op.vector, DOMID_SELF,
+        xen_irq_info_pirq_init(irq, 0, pirq, gsi, DOMID_SELF,
                                shareable ? PIRQ_SHAREABLE : 0);
 
         pirq_query_unmask(irq);
@@ -762,8 +758,7 @@ int xen_allocate_pirq_msi(struct pci_dev *dev, struct msi_desc *msidesc)
 }
 
 int xen_bind_pirq_msi_to_irq(struct pci_dev *dev, struct msi_desc *msidesc,
-                             int pirq, int vector, const char *name,
-                             domid_t domid)
+                             int pirq, const char *name, domid_t domid)
 {
         int irq, ret;
 
@@ -776,7 +771,7 @@ int xen_bind_pirq_msi_to_irq(struct pci_dev *dev, struct msi_desc *msidesc,
         irq_set_chip_and_handler_name(irq, &xen_pirq_chip, handle_edge_irq,
                         name);
 
-        xen_irq_info_pirq_init(irq, 0, pirq, 0, vector, domid, 0);
+        xen_irq_info_pirq_init(irq, 0, pirq, 0, domid, 0);
         ret = irq_set_msi_desc(irq, msidesc);
         if (ret < 0)
                 goto error_irq;