From ce1606fd598a495df0747a1273c5b18780c1f740 Mon Sep 17 00:00:00 2001
From: Bryan O'Sullivan <bos@pathscale.com>
Date: Sat, 1 Jul 2006 04:35:59 -0700
Subject: [PATCH] --- yaml --- r: 31551 b: refs/heads/master c:
 b35f004dd3276fc43f242d9a52b4cf74877137c3 h: refs/heads/master i:   31549:
 9c3f929101cb007a0c1a58e5cfaa6ed953d4bbdf   31547:
 f92d7718cbffba34f82d427c5ecd302b7dd44298   31543:
 a535d0fa038184bd140048fda2078a7b605b9354   31535:
 55e1aff6ae5eb61831416ee9e344b1d8c5244633   31519:
 d35020d23e147e8b8bd7d11f86323b4adb1fd14a   31487:
 ca506e38bb7fae35b951e392cafb7ea512a8de3b v: v3

---
 [refs]                                           | 2 +-
 trunk/drivers/infiniband/hw/ipath/ipath_driver.c | 7 ++-----
 trunk/drivers/infiniband/hw/ipath/ipath_kernel.h | 5 -----
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 48f378ca04e1..631ab21b1908 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe62546a6afa141c4ab9aef65f5978a1b36cb523
+refs/heads/master: b35f004dd3276fc43f242d9a52b4cf74877137c3
diff --git a/trunk/drivers/infiniband/hw/ipath/ipath_driver.c b/trunk/drivers/infiniband/hw/ipath/ipath_driver.c
index 0a93e2282beb..290080b2c8f1 100644
--- a/trunk/drivers/infiniband/hw/ipath/ipath_driver.c
+++ b/trunk/drivers/infiniband/hw/ipath/ipath_driver.c
@@ -496,10 +496,8 @@ static int __devinit ipath_init_one(struct pci_dev *pdev,
 		((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_devdata *dd)
 			 * re-init
 			 */
 			dd->ipath_kregbase = NULL;
-			dd->ipath_kregvirt = NULL;
 			dd->ipath_uregbase = 0;
 			dd->ipath_sregbase = 0;
 			dd->ipath_cregbase = 0;
diff --git a/trunk/drivers/infiniband/hw/ipath/ipath_kernel.h b/trunk/drivers/infiniband/hw/ipath/ipath_kernel.h
index 751648222825..93508c5aba7f 100644
--- a/trunk/drivers/infiniband/hw/ipath/ipath_kernel.h
+++ b/trunk/drivers/infiniband/hw/ipath/ipath_kernel.h
@@ -158,11 +158,6 @@ struct ipath_devdata {
 	unsigned long ipath_physaddr;
 	/* 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.