Date: Fri, 20 May 2011 06:49:43 +0000 (UTC) From: Andriy Gapon <avg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r222113 - stable/7/sys/dev/sound/pcm Message-ID: <201105200649.p4K6nhuK070694@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: avg Date: Fri May 20 06:49:43 2011 New Revision: 222113 URL: http://svn.freebsd.org/changeset/base/222113 Log: fix build breakage by adjusting for API difference in r222092 (MFC of r221803,221809) This is a direct commit. Reported by: Jeremy Chadwick <freebsd@jdc.parodius.com>, tinderbox Pointyhat to: avg Modified: stable/7/sys/dev/sound/pcm/dsp.c Modified: stable/7/sys/dev/sound/pcm/dsp.c ============================================================================== --- stable/7/sys/dev/sound/pcm/dsp.c Fri May 20 03:23:09 2011 (r222112) +++ stable/7/sys/dev/sound/pcm/dsp.c Fri May 20 06:49:43 2011 (r222113) @@ -1859,7 +1859,6 @@ static int dsp_mmap(struct cdev *i_dev, vm_offset_t offset, vm_paddr_t *paddr, int nprot) { - /* XXX memattr is not honored */ *paddr = vtophys(offset); return (0); } @@ -1916,7 +1915,7 @@ dsp_mmap_single(struct cdev *i_dev, vm_o *offset = (uintptr_t)sndbuf_getbufofs(c->bufsoft, *offset); relchns(i_dev, rdch, wrch, SD_F_PRIO_RD | SD_F_PRIO_WR); *object = vm_pager_allocate(OBJT_DEVICE, i_dev, - size, nprot, *offset, curthread->td_ucred); + size, nprot, *offset); PCM_GIANT_LEAVE(d);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201105200649.p4K6nhuK070694>