diff options
Diffstat (limited to 'drivers/infiniband')
-rw-r--r-- | drivers/infiniband/hw/amso1100/c2.c | 2 | ||||
-rw-r--r-- | drivers/infiniband/hw/ehca/ehca_eq.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/infiniband/hw/amso1100/c2.c b/drivers/infiniband/hw/amso1100/c2.c index 27fe242ed43..59243d9aedd 100644 --- a/drivers/infiniband/hw/amso1100/c2.c +++ b/drivers/infiniband/hw/amso1100/c2.c | |||
@@ -1073,7 +1073,7 @@ static int __devinit c2_probe(struct pci_dev *pcidev, | |||
1073 | 0xffffc000) / sizeof(struct c2_rxp_desc); | 1073 | 0xffffc000) / sizeof(struct c2_rxp_desc); |
1074 | 1074 | ||
1075 | /* Request an interrupt line for the driver */ | 1075 | /* Request an interrupt line for the driver */ |
1076 | ret = request_irq(pcidev->irq, c2_interrupt, SA_SHIRQ, DRV_NAME, c2dev); | 1076 | ret = request_irq(pcidev->irq, c2_interrupt, IRQF_SHARED, DRV_NAME, c2dev); |
1077 | if (ret) { | 1077 | if (ret) { |
1078 | printk(KERN_ERR PFX "%s: requested IRQ %u is busy\n", | 1078 | printk(KERN_ERR PFX "%s: requested IRQ %u is busy\n", |
1079 | pci_name(pcidev), pcidev->irq); | 1079 | pci_name(pcidev), pcidev->irq); |
diff --git a/drivers/infiniband/hw/ehca/ehca_eq.c b/drivers/infiniband/hw/ehca/ehca_eq.c index 5281dec66f1..24ceab0bae4 100644 --- a/drivers/infiniband/hw/ehca/ehca_eq.c +++ b/drivers/infiniband/hw/ehca/ehca_eq.c | |||
@@ -122,7 +122,7 @@ int ehca_create_eq(struct ehca_shca *shca, | |||
122 | /* register interrupt handlers and initialize work queues */ | 122 | /* register interrupt handlers and initialize work queues */ |
123 | if (type == EHCA_EQ) { | 123 | if (type == EHCA_EQ) { |
124 | ret = ibmebus_request_irq(NULL, eq->ist, ehca_interrupt_eq, | 124 | ret = ibmebus_request_irq(NULL, eq->ist, ehca_interrupt_eq, |
125 | SA_INTERRUPT, "ehca_eq", | 125 | IRQF_DISABLED, "ehca_eq", |
126 | (void *)shca); | 126 | (void *)shca); |
127 | if (ret < 0) | 127 | if (ret < 0) |
128 | ehca_err(ib_dev, "Can't map interrupt handler."); | 128 | ehca_err(ib_dev, "Can't map interrupt handler."); |
@@ -130,7 +130,7 @@ int ehca_create_eq(struct ehca_shca *shca, | |||
130 | tasklet_init(&eq->interrupt_task, ehca_tasklet_eq, (long)shca); | 130 | tasklet_init(&eq->interrupt_task, ehca_tasklet_eq, (long)shca); |
131 | } else if (type == EHCA_NEQ) { | 131 | } else if (type == EHCA_NEQ) { |
132 | ret = ibmebus_request_irq(NULL, eq->ist, ehca_interrupt_neq, | 132 | ret = ibmebus_request_irq(NULL, eq->ist, ehca_interrupt_neq, |
133 | SA_INTERRUPT, "ehca_neq", | 133 | IRQF_DISABLED, "ehca_neq", |
134 | (void *)shca); | 134 | (void *)shca); |
135 | if (ret < 0) | 135 | if (ret < 0) |
136 | ehca_err(ib_dev, "Can't map interrupt handler."); | 136 | ehca_err(ib_dev, "Can't map interrupt handler."); |