From owner-svn-src-head@FreeBSD.ORG Mon Mar 21 21:16:41 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5A682106595C; Mon, 21 Mar 2011 21:16:41 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2EEEE8FC25; Mon, 21 Mar 2011 21:16:41 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p2LLGfj4021079; Mon, 21 Mar 2011 21:16:41 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2LLGfaB021074; Mon, 21 Mar 2011 21:16:41 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201103212116.p2LLGfaB021074@svn.freebsd.org> From: Konstantin Belousov Date: Mon, 21 Mar 2011 21:16:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219846 - in head/sys/ofed: drivers/infiniband/hw/mthca include/linux include/rdma X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Mar 2011 21:16:41 -0000 Author: kib Date: Mon Mar 21 21:16:40 2011 New Revision: 219846 URL: http://svn.freebsd.org/changeset/base/219846 Log: Allow the ofed modules to be compiled on i386. Reviewed by: jeff Modified: head/sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c head/sys/ofed/include/linux/gfp.h head/sys/ofed/include/linux/scatterlist.h head/sys/ofed/include/rdma/ib_addr.h Modified: head/sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c ============================================================================== --- head/sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c Mon Mar 21 21:16:25 2011 (r219845) +++ head/sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c Mon Mar 21 21:16:40 2011 (r219846) @@ -1228,8 +1228,8 @@ static int __devinit mthca_init_one(stru } 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; } Modified: head/sys/ofed/include/linux/gfp.h ============================================================================== --- head/sys/ofed/include/linux/gfp.h Mon Mar 21 21:16:25 2011 (r219845) +++ head/sys/ofed/include/linux/gfp.h Mon Mar 21 21:16:40 2011 (r219846) @@ -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 Modified: head/sys/ofed/include/linux/scatterlist.h ============================================================================== --- head/sys/ofed/include/linux/scatterlist.h Mon Mar 21 21:16:25 2011 (r219845) +++ head/sys/ofed/include/linux/scatterlist.h Mon Mar 21 21:16:40 2011 (r219846) @@ -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; Modified: head/sys/ofed/include/rdma/ib_addr.h ============================================================================== --- head/sys/ofed/include/rdma/ib_addr.h Mon Mar 21 21:16:25 2011 (r219845) +++ head/sys/ofed/include/rdma/ib_addr.h Mon Mar 21 21:16:40 2011 (r219846) @@ -247,6 +247,7 @@ static inline int iboe_get_rate(struct n #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 n else if (dev->if_baudrate >= IF_Gbps(10ULL)) return IB_RATE_10_GBPS; else +#endif return IB_RATE_PORT_CURRENT; } #endif