Date: Thu, 31 Oct 2013 23:58:31 +0000 (UTC) From: Marcel Moolenaar <marcel@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257481 - projects/altix2/sys/kern Message-ID: <201310312358.r9VNwVH0020509@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310312358.r9VNwVH0020509>