From owner-svn-src-projects@freebsd.org Sun May 22 08:42:46 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 B7C3EB44C9C for ; Sun, 22 May 2016 08:42:46 +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 825D01AC8; Sun, 22 May 2016 08:42:46 +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 u4M8gjQd002432; Sun, 22 May 2016 08:42:45 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4M8gjf8002430; Sun, 22 May 2016 08:42:45 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201605220842.u4M8gjf8002430@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 08:42:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r300407 - 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 08:42:46 -0000 Author: ngie Date: Sun May 22 08:42:45 2016 New Revision: 300407 URL: https://svnweb.freebsd.org/changeset/base/300407 Log: Fix compiling with i386 and INVARIANTS Fix broken KASSERT and remove broken device_printf (was bogus) Modified: projects/vmware_pvscsi/sys/dev/vmware/vmw_pvscsi/compat_freebsd.h projects/vmware_pvscsi/sys/dev/vmware/vmw_pvscsi/vmw_pvscsi.c 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 08:20:30 2016 (r300406) +++ projects/vmware_pvscsi/sys/dev/vmware/vmw_pvscsi/compat_freebsd.h Sun May 22 08:42:45 2016 (r300407) @@ -139,11 +139,8 @@ pci_map_single_fn(void *va, size_t len) bus_addr_t retval, lastb; retval = virt_to_phys(va); - if (len) { + if (len != 0) lastb = virt_to_phys((char *)va + len - 1); - KASSERT((lastb & ~PAGE_MASK) == (retval & ~PAGE_MASK), - ("%lx %lx %p %zu", lastb, retval, va, len)); - } return retval; } Modified: projects/vmware_pvscsi/sys/dev/vmware/vmw_pvscsi/vmw_pvscsi.c ============================================================================== --- projects/vmware_pvscsi/sys/dev/vmware/vmw_pvscsi/vmw_pvscsi.c Sun May 22 08:20:30 2016 (r300406) +++ projects/vmware_pvscsi/sys/dev/vmware/vmw_pvscsi/vmw_pvscsi.c Sun May 22 08:42:45 2016 (r300407) @@ -1792,7 +1792,7 @@ static void pvscsi_release_resources(str pvscsi_free_sgls(adapter); kfree(adapter->cmd_map); #else - KASSERT((adapter->cmd_map_size > 0), "adapter->"); + KASSERT(adapter->cmd_map_size > 0, ("adapter->")); pvscsi_free_sgls(adapter); kfree(adapter->cmd_map, adapter->cmd_map_size); #endif