From owner-svn-src-all@FreeBSD.ORG Fri Mar 21 13:31:56 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E129D8D3; Fri, 21 Mar 2014 13:31:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C7AB6A73; Fri, 21 Mar 2014 13:31:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2LDVu8r024039; Fri, 21 Mar 2014 13:31:56 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2LDVudg024038; Fri, 21 Mar 2014 13:31:56 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201403211331.s2LDVudg024038@svn.freebsd.org> From: Konstantin Belousov Date: Fri, 21 Mar 2014 13:31:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r263470 - stable/10/sys/x86/iommu X-SVN-Group: stable-10 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.17 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, 21 Mar 2014 13:31:57 -0000 Author: kib Date: Fri Mar 21 13:31:56 2014 New Revision: 263470 URL: http://svnweb.freebsd.org/changeset/base/263470 Log: MFC r263304: Trim at EOL. Modified: stable/10/sys/x86/iommu/busdma_dmar.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/x86/iommu/busdma_dmar.c ============================================================================== --- stable/10/sys/x86/iommu/busdma_dmar.c Fri Mar 21 11:11:30 2014 (r263469) +++ stable/10/sys/x86/iommu/busdma_dmar.c Fri Mar 21 13:31:56 2014 (r263470) @@ -237,7 +237,7 @@ dmar_bus_dmamap_create(bus_dma_tag_t dma map->cansleep = false; tag->map_count++; *mapp = (bus_dmamap_t)map; - + return (0); } @@ -280,7 +280,7 @@ dmar_bus_dmamem_alloc(bus_dma_tag_t dmat mflags |= (flags & BUS_DMA_ZERO) != 0 ? M_ZERO : 0; attr = (flags & BUS_DMA_NOCACHE) != 0 ? VM_MEMATTR_UNCACHEABLE : VM_MEMATTR_DEFAULT; - + tag = (struct bus_dma_tag_dmar *)dmat; map = (struct bus_dmamap_dmar *)*mapp;