From owner-svn-src-projects@FreeBSD.ORG Thu Oct 31 23:58:32 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 316E92F9; Thu, 31 Oct 2013 23:58:32 +0000 (UTC) (envelope-from marcel@FreeBSD.org) 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 1E9E32D47; Thu, 31 Oct 2013 23:58:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9VNwVLb020510; Thu, 31 Oct 2013 23:58:31 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9VNwVH0020509; Thu, 31 Oct 2013 23:58:31 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201310312358.r9VNwVH0020509@svn.freebsd.org> From: Marcel Moolenaar Date: Thu, 31 Oct 2013 23:58:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257481 - projects/altix2/sys/kern 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.14 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: Thu, 31 Oct 2013 23:58:32 -0000 Author: marcel Date: Thu Oct 31 23:58:31 2013 New Revision: 257481 URL: http://svnweb.freebsd.org/changeset/base/257481 Log: Adjust to changed prototypes of kmem_alloc_contig() and kmem_free(). Modified: projects/altix2/sys/kern/subr_busdma.c Modified: projects/altix2/sys/kern/subr_busdma.c ============================================================================== --- projects/altix2/sys/kern/subr_busdma.c Thu Oct 31 23:57:33 2013 (r257480) +++ projects/altix2/sys/kern/subr_busdma.c Thu Oct 31 23:58:31 2013 (r257481) @@ -938,7 +938,7 @@ busdma_mem_alloc(struct busdma_tag *tag, seg->mds_busaddr = ~0UL; seg->mds_paddr = ~0UL; seg->mds_size = MIN(maxsz, mtag.dmt_maxsz); - seg->mds_vaddr = kmem_alloc_contig(kernel_map, seg->mds_size, + seg->mds_vaddr = kmem_alloc_contig(kernel_arena, seg->mds_size, mflags, mtag.dmt_minaddr, mtag.dmt_maxaddr, mtag.dmt_align, mtag.dmt_bndry, VM_MEMATTR_DEFAULT); if (seg->mds_vaddr == 0) { @@ -960,7 +960,7 @@ busdma_mem_alloc(struct busdma_tag *tag, fail: while ((seg = TAILQ_FIRST(&md->md_seg)) != NULL) { if (seg->mds_paddr != ~0UL) - kmem_free(kernel_map, seg->mds_vaddr, seg->mds_size); + kmem_free(kernel_arena, seg->mds_vaddr, seg->mds_size); TAILQ_REMOVE(&md->md_seg, seg, mds_chain); uma_zfree(busdma_md_seg_zone, seg); } @@ -986,7 +986,7 @@ busdma_mem_free(struct busdma_md *md) return (error); while ((seg = TAILQ_FIRST(&md->md_seg)) != NULL) { - kmem_free(kernel_map, seg->mds_vaddr, seg->mds_size); + kmem_free(kernel_arena, seg->mds_vaddr, seg->mds_size); TAILQ_REMOVE(&md->md_seg, seg, mds_chain); uma_zfree(busdma_md_seg_zone, seg); }