From owner-svn-src-all@FreeBSD.ORG  Fri May 20 06:49:44 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0D7FA1065673;
	Fri, 20 May 2011 06:49:44 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id F0A478FC18;
	Fri, 20 May 2011 06:49:43 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4K6nhLN070696;
	Fri, 20 May 2011 06:49:43 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4K6nhuK070694;
	Fri, 20 May 2011 06:49:43 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201105200649.p4K6nhuK070694@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Fri, 20 May 2011 06:49:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r222113 - stable/7/sys/dev/sound/pcm
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 20 May 2011 06:49:44 -0000

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);