The patch titled
IB/ipath: removed unused field ipath_kregvirt from struct ipath_devdata
has been removed from the -mm tree. Its filename is
ib-ipath-removed-unused-field-ipath_kregvirt-from.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: IB/ipath: removed unused field ipath_kregvirt from struct ipath_devdata
From: "Bryan O'Sullivan" <bos@xxxxxxxxxxxxx>
Signed-off-by: Dave Olson <dave.olson@xxxxxxxxxx>
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 | 7 ++-----
drivers/infiniband/hw/ipath/ipath_kernel.h | 5 -----
2 files changed, 2 insertions(+), 10 deletions(-)
diff -puN drivers/infiniband/hw/ipath/ipath_driver.c~ib-ipath-removed-unused-field-ipath_kregvirt-from drivers/infiniband/hw/ipath/ipath_driver.c
--- a/drivers/infiniband/hw/ipath/ipath_driver.c~ib-ipath-removed-unused-field-ipath_kregvirt-from
+++ a/drivers/infiniband/hw/ipath/ipath_driver.c
@@ -496,10 +496,8 @@ static int __devinit ipath_init_one(stru
((void __iomem *)dd->ipath_kregbase + len);
dd->ipath_physaddr = addr; /* used for io_remap, etc. */
/* for user mmap */
- dd->ipath_kregvirt = (u64 __iomem *) phys_to_virt(addr);
- ipath_cdbg(VERBOSE, "mapped io addr %llx to kregbase %p "
- "kregvirt %p\n", addr, dd->ipath_kregbase,
- dd->ipath_kregvirt);
+ ipath_cdbg(VERBOSE, "mapped io addr %llx to kregbase %p\n",
+ addr, dd->ipath_kregbase);
/*
* clear ipath_flags here instead of in ipath_init_chip as it is set
@@ -1809,7 +1807,6 @@ static void cleanup_device(struct ipath_
* re-init
*/
dd->ipath_kregbase = NULL;
- dd->ipath_kregvirt = NULL;
dd->ipath_uregbase = 0;
dd->ipath_sregbase = 0;
dd->ipath_cregbase = 0;
diff -puN drivers/infiniband/hw/ipath/ipath_kernel.h~ib-ipath-removed-unused-field-ipath_kregvirt-from drivers/infiniband/hw/ipath/ipath_kernel.h
--- a/drivers/infiniband/hw/ipath/ipath_kernel.h~ib-ipath-removed-unused-field-ipath_kregvirt-from
+++ a/drivers/infiniband/hw/ipath/ipath_kernel.h
@@ -159,11 +159,6 @@ struct ipath_devdata {
/* base of memory alloced for ipath_kregbase, for free */
u64 *ipath_kregalloc;
/*
- * version of kregbase that doesn't have high bits set (for 32 bit
- * programs, so mmap64 44 bit works)
- */
- u64 __iomem *ipath_kregvirt;
- /*
* virtual address where port0 rcvhdrqtail updated for this unit.
* only written to by the chip, not the driver.
*/
_
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
