git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
drivers
/
infiniband
/
hw
/
mthca
/
mthca_eq.c
diff --git
a/drivers/infiniband/hw/mthca/mthca_eq.c
b/drivers/infiniband/hw/mthca/mthca_eq.c
index
a29b1b6
..
99f109c
100644
(file)
--- a/
drivers/infiniband/hw/mthca/mthca_eq.c
+++ b/
drivers/infiniband/hw/mthca/mthca_eq.c
@@
-695,6
+695,10
@@
static void mthca_unmap_reg(struct mthca_dev *dev, unsigned long offset,
static int __devinit mthca_map_eq_regs(struct mthca_dev *dev)
{
static int __devinit mthca_map_eq_regs(struct mthca_dev *dev)
{
+ unsigned long mthca_base;
+
+ mthca_base = pci_resource_start(dev->pdev, 0);
+
if (mthca_is_memfree(dev)) {
/*
* We assume that the EQ arm and EQ set CI registers
if (mthca_is_memfree(dev)) {
/*
* We assume that the EQ arm and EQ set CI registers
@@
-900,7
+904,7
@@
int __devinit mthca_init_eq_table(struct mthca_dev *dev)
mthca_is_memfree(dev) ?
mthca_arbel_interrupt :
mthca_tavor_interrupt,
mthca_is_memfree(dev) ?
mthca_arbel_interrupt :
mthca_tavor_interrupt,
-
IRQF_SHARED
, DRV_NAME, dev);
+
SA_SHIRQ
, DRV_NAME, dev);
if (err)
goto err_out_cmd;
dev->eq_table.have_irq = 1;
if (err)
goto err_out_cmd;
dev->eq_table.have_irq = 1;