The patch titled
IB/ipath: use vmalloc to allocate struct ipath_devdata
has been removed from the -mm tree. Its filename is
ib-ipath-use-vmalloc-to-allocate-struct.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: IB/ipath: use vmalloc to allocate struct ipath_devdata
From: "Bryan O'Sullivan" <bos@xxxxxxxxxxxxx>
This is not a DMA target, so no need to use dma_alloc_coherent on it.
Signed-off-by: Bryan O'Sullivan <bryan.osullivan@xxxxxxxxxx>
Cc: "Michael S. Tsirkin" <mst@xxxxxxxxxxxxxx>
Cc: Roland Dreier <rolandd@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/infiniband/hw/ipath/ipath_driver.c | 10 +++-------
drivers/infiniband/hw/ipath/ipath_kernel.h | 1 -
2 files changed, 3 insertions(+), 8 deletions(-)
diff -puN drivers/infiniband/hw/ipath/ipath_driver.c~ib-ipath-use-vmalloc-to-allocate-struct drivers/infiniband/hw/ipath/ipath_driver.c
--- a/drivers/infiniband/hw/ipath/ipath_driver.c~ib-ipath-use-vmalloc-to-allocate-struct
+++ a/drivers/infiniband/hw/ipath/ipath_driver.c
@@ -171,14 +171,13 @@ static void ipath_free_devdata(struct pc
list_del(&dd->ipath_list);
spin_unlock_irqrestore(&ipath_devs_lock, flags);
}
- dma_free_coherent(&pdev->dev, sizeof(*dd), dd, dd->ipath_dma_addr);
+ vfree(dd);
}
static struct ipath_devdata *ipath_alloc_devdata(struct pci_dev *pdev)
{
unsigned long flags;
struct ipath_devdata *dd;
- dma_addr_t dma_addr;
int ret;
if (!idr_pre_get(&unit_table, GFP_KERNEL)) {
@@ -186,15 +185,12 @@ static struct ipath_devdata *ipath_alloc
goto bail;
}
- dd = dma_alloc_coherent(&pdev->dev, sizeof(*dd), &dma_addr,
- GFP_KERNEL);
-
+ dd = vmalloc(sizeof(*dd));
if (!dd) {
dd = ERR_PTR(-ENOMEM);
goto bail;
}
-
- dd->ipath_dma_addr = dma_addr;
+ memset(dd, 0, sizeof(*dd));
dd->ipath_unit = -1;
spin_lock_irqsave(&ipath_devs_lock, flags);
diff -puN drivers/infiniband/hw/ipath/ipath_kernel.h~ib-ipath-use-vmalloc-to-allocate-struct drivers/infiniband/hw/ipath/ipath_kernel.h
--- a/drivers/infiniband/hw/ipath/ipath_kernel.h~ib-ipath-use-vmalloc-to-allocate-struct
+++ a/drivers/infiniband/hw/ipath/ipath_kernel.h
@@ -163,7 +163,6 @@ struct ipath_devdata {
* only written to by the chip, not the driver.
*/
volatile __le64 *ipath_hdrqtailptr;
- dma_addr_t ipath_dma_addr;
/* ipath_cfgports pointers */
struct ipath_portdata **ipath_pd;
/* sk_buffs used by port 0 eager receive queue */
_
Patches currently in -mm which might be from bos@xxxxxxxxxxxxx are
origin.patch
ib-ipath-fixes-a-bug-where-our-delay-for-eeprom-no.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
