Date: Sun, 22 May 2016 08:42:45 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r300407 - projects/vmware_pvscsi/sys/dev/vmware/vmw_pvscsi Message-ID: <201605220842.u4M8gjf8002430@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605220842.u4M8gjf8002430>