Page MenuHomeFreeBSD
Files F151336857

D21828.diff
No OneTemporary
Actions

D21828.diff
View Options

Index: sys/compat/linuxkpi/common/include/linux/interrupt.h
===================================================================
--- sys/compat/linuxkpi/common/include/linux/interrupt.h
+++ sys/compat/linuxkpi/common/include/linux/interrupt.h
@@ -108,6 +108,8 @@
return (-error);
}
list_add(&irqe->links, &dev->irqents);
+ if (name != NULL)
+ (void)bus_describe_intr(dev->bsddev, res, irqe->tag, "%s", name);
return 0;
}
Index: sys/dev/mlx4/mlx4_core/mlx4_eq.c
===================================================================
--- sys/dev/mlx4/mlx4_core/mlx4_eq.c
+++ sys/dev/mlx4/mlx4_core/mlx4_eq.c
@@ -1251,7 +1251,7 @@
MLX4_EQ_ASYNC * MLX4_IRQNAME_SIZE;
err = request_irq(priv->eq_table.eq[MLX4_EQ_ASYNC].irq,
- mlx4_msi_x_interrupt, 0, eq_name,
+ mlx4_msi_x_interrupt, 0, NULL,
priv->eq_table.eq + MLX4_EQ_ASYNC);
if (err)
goto err_out_unmap;
@@ -1263,7 +1263,7 @@
DRV_NAME "@pci:%s",
pci_name(dev->persist->pdev));
err = request_irq(dev->persist->pdev->irq, mlx4_interrupt,
- IRQF_SHARED, priv->eq_table.irq_names, dev);
+ IRQF_SHARED, NULL, dev);
if (err)
goto err_out_unmap;
@@ -1484,7 +1484,7 @@
err = request_irq(priv->eq_table.eq[*prequested_vector].irq,
mlx4_msi_x_interrupt, 0,
- &priv->eq_table.irq_names[*prequested_vector << 5],
+ NULL,
priv->eq_table.eq + *prequested_vector);
if (err) {
Index: sys/dev/mthca/mthca_eq.c
===================================================================
--- sys/dev/mthca/mthca_eq.c
+++ sys/dev/mthca/mthca_eq.c
@@ -828,7 +828,7 @@
mthca_is_memfree(dev) ?
mthca_arbel_msi_x_interrupt :
mthca_tavor_msi_x_interrupt,
- 0, dev->eq_table.eq[i].irq_name,
+ 0, NULL,
dev->eq_table.eq + i);
if (err)
goto err_out_cmd;
@@ -841,7 +841,7 @@
mthca_is_memfree(dev) ?
mthca_arbel_interrupt :
mthca_tavor_interrupt,
- IRQF_SHARED, dev->eq_table.eq[0].irq_name, dev);
+ IRQF_SHARED, NULL, dev);
if (err)
goto err_out_cmd;
dev->eq_table.have_irq = 1;

File Metadata

Mime Type
text/plain
Expires
Wed, Apr 8, 4:58 PM (15 h, 56 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31108714
Default Alt Text
D21828.diff (2 KB)

Event Timeline