From f394ce6e5bf976f4449596ad943b045a86cd3690 Mon Sep 17 00:00:00 2001
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Mon, 21 Mar 2011 21:16:40 +0000
Subject: [PATCH] Allow the ofed modules to be compiled on i386.

Reviewed by:	jeff
---
 sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c | 4 ++--
 sys/ofed/include/linux/gfp.h                      | 3 ++-
 sys/ofed/include/linux/scatterlist.h              | 2 +-
 sys/ofed/include/rdma/ib_addr.h                   | 2 ++
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c b/sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c
index 772cf8ce381..5401364dd2f 100644
--- a/sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c
+++ b/sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c
@@ -1228,8 +1228,8 @@ static int __devinit mthca_init_one(struct pci_dev *pdev,
 	}
 
 	if (id->driver_data >= ARRAY_SIZE(mthca_hca_table)) {
-		printk(KERN_ERR PFX "%s has invalid driver data %lx\n",
-		       pci_name(pdev), id->driver_data);
+		printk(KERN_ERR PFX "%s has invalid driver data %jx\n",
+		       pci_name(pdev), (uintmax_t)id->driver_data);
 		mutex_unlock(&mthca_device_mutex);
 		return -ENODEV;
 	}
diff --git a/sys/ofed/include/linux/gfp.h b/sys/ofed/include/linux/gfp.h
index 7f8a24ff722..661ff41ab24 100644
--- a/sys/ofed/include/linux/gfp.h
+++ b/sys/ofed/include/linux/gfp.h
@@ -56,7 +56,8 @@ page_address(struct page *page)
 
 	if (page->object != kmem_object && page->object != kernel_object)
 		return (NULL);
-	return (void *)(VM_MIN_KERNEL_ADDRESS + IDX_TO_OFF(page->pindex));
+	return ((void *)(uintptr_t)(VM_MIN_KERNEL_ADDRESS +
+	    IDX_TO_OFF(page->pindex)));
 }
 
 static inline unsigned long
diff --git a/sys/ofed/include/linux/scatterlist.h b/sys/ofed/include/linux/scatterlist.h
index 611ad565915..49dc31def1a 100644
--- a/sys/ofed/include/linux/scatterlist.h
+++ b/sys/ofed/include/linux/scatterlist.h
@@ -36,7 +36,7 @@ struct scatterlist {
 		struct page		*page;
 		struct scatterlist	*sg;
 	} sl_un;
-	unsigned long	address;
+	dma_addr_t	address;
 	unsigned long	offset;
 	uint32_t	length;
 	uint32_t	flags;
diff --git a/sys/ofed/include/rdma/ib_addr.h b/sys/ofed/include/rdma/ib_addr.h
index 61b0a7cf1e9..0783abe4c86 100644
--- a/sys/ofed/include/rdma/ib_addr.h
+++ b/sys/ofed/include/rdma/ib_addr.h
@@ -247,6 +247,7 @@ static inline int iboe_get_rate(struct net_device *dev)
 #else
 static inline int iboe_get_rate(struct net_device *dev)
 {
+#ifdef __amd64__
 	if (dev->if_baudrate >= IF_Gbps(40ULL))
 		return IB_RATE_40_GBPS;
 	else if (dev->if_baudrate >= IF_Gbps(30ULL))
@@ -256,6 +257,7 @@ static inline int iboe_get_rate(struct net_device *dev)
 	else if (dev->if_baudrate >= IF_Gbps(10ULL))
 		return IB_RATE_10_GBPS;
 	else
+#endif
 		return IB_RATE_PORT_CURRENT;
 }
 #endif