From f394ce6e5bf976f4449596ad943b045a86cd3690 Mon Sep 17 00:00:00 2001 From: Konstantin Belousov Date: Mon, 21 Mar 2011 21:16:40 +0000 Subject: Allow the ofed modules to be compiled on i386. Reviewed by: jeff --- sys/ofed/include/linux/gfp.h | 3 ++- sys/ofed/include/linux/scatterlist.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'sys/ofed/include/linux') diff --git a/sys/ofed/include/linux/gfp.h b/sys/ofed/include/linux/gfp.h index 7f8a24ff7222..661ff41ab248 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 611ad565915b..49dc31def1af 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; -- cgit v1.3