From owner-svn-src-projects@freebsd.org Sun May 22 07:25:00 2016 Return-Path: Delivered-To: svn-src-projects@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 830AFB447B6 for ; Sun, 22 May 2016 07:25:00 +0000 (UTC) (envelope-from ngie@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 45E4B10EF; Sun, 22 May 2016 07:25:00 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4M7Ox6A077694; Sun, 22 May 2016 07:24:59 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4M7OxXi077693; Sun, 22 May 2016 07:24:59 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201605220724.u4M7OxXi077693@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 22 May 2016 07:24:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r300401 - projects/vmware_pvscsi/sys/dev/vmware/vmw_pvscsi X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 May 2016 07:25:00 -0000 Author: ngie Date: Sun May 22 07:24:59 2016 New Revision: 300401 URL: https://svnweb.freebsd.org/changeset/base/300401 Log: virt_to_phys is duplicating vtophys; reduce complexity a tad Modified: projects/vmware_pvscsi/sys/dev/vmware/vmw_pvscsi/compat_freebsd.h Modified: projects/vmware_pvscsi/sys/dev/vmware/vmw_pvscsi/compat_freebsd.h ============================================================================== --- projects/vmware_pvscsi/sys/dev/vmware/vmw_pvscsi/compat_freebsd.h Sun May 22 07:14:59 2016 (r300400) +++ projects/vmware_pvscsi/sys/dev/vmware/vmw_pvscsi/compat_freebsd.h Sun May 22 07:24:59 2016 (r300401) @@ -92,12 +92,7 @@ typedef u_int64_t __be64; typedef bus_addr_t dma_addr_t; -static inline vm_paddr_t -virt_to_phys(void *va) -{ - uintptr_t v = (uintptr_t)va; - return (vtophys(v & ~PAGE_MASK)+(v&PAGE_MASK)); -} +#define virt_to_phys(v) vtophys(v) MALLOC_DECLARE(M_PVSCSI); MALLOC_DECLARE(M_PVSCSI_PCI);