From owner-svn-src-all@freebsd.org Fri Oct 23 14:52:06 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id ED85CA1DCA0; Fri, 23 Oct 2015 14:52:06 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B0DA3375; Fri, 23 Oct 2015 14:52:06 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9NEq5Yu005722; Fri, 23 Oct 2015 14:52:05 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9NEq5LP005721; Fri, 23 Oct 2015 14:52:05 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201510231452.t9NEq5LP005721@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Fri, 23 Oct 2015 14:52:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r289830 - head/sys/ofed/include/linux X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Oct 2015 14:52:07 -0000 Author: hselasky Date: Fri Oct 23 14:52:05 2015 New Revision: 289830 URL: https://svnweb.freebsd.org/changeset/base/289830 Log: Build fix for non-i386 and non-amd64 platforms. Sponsored by: Mellanox Technologies Modified: head/sys/ofed/include/linux/linux_compat.c Modified: head/sys/ofed/include/linux/linux_compat.c ============================================================================== --- head/sys/ofed/include/linux/linux_compat.c Fri Oct 23 14:26:06 2015 (r289829) +++ head/sys/ofed/include/linux/linux_compat.c Fri Oct 23 14:52:05 2015 (r289830) @@ -663,7 +663,11 @@ _ioremap_attr(vm_paddr_t phys_addr, unsi { void *addr; +#if defined(__i386__) || defined(__amd64__) addr = pmap_mapdev_attr(phys_addr, size, attr); +#else + addr = NULL; +#endif if (addr == NULL) return (NULL); vmmap_add(addr, size); @@ -679,7 +683,9 @@ iounmap(void *addr) vmmap = vmmap_remove(addr); if (vmmap == NULL) return; +#if defined(__i386__) || defined(__amd64__) pmap_unmapdev((vm_offset_t)addr, vmmap->vm_size); +#endif kfree(vmmap); }