From: "Bryan O'Sullivan" Signed-off-by: Dave Olson Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton --- 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. */ _