d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow the ofed modules to be compiled on i386.

Browse Source 
Reviewed by:	jeff
This commit is contained in:
kib 2011-03-21 21:16:40 +00:00
parent 9fa2bf8aee
commit 3591d152b2
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c
View File

@ -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;
}

3
sys/ofed/include/linux/gfp.h
View File

@ -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

2
sys/ofed/include/linux/scatterlist.h
View File

@ -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;

2
sys/ofed/include/rdma/ib_addr.h
View File

@ -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