From owner-svn-src-stable@FreeBSD.ORG  Tue Jun 18 15:31:44 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 652F768D;
 Tue, 18 Jun 2013 15:31:44 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 571631123;
 Tue, 18 Jun 2013 15:31:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5IFViiq006334;
 Tue, 18 Jun 2013 15:31:44 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5IFVikH006333;
 Tue, 18 Jun 2013 15:31:44 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201306181531.r5IFVikH006333@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Tue, 18 Jun 2013 15:31:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r251951 - stable/9/sys/kern
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 18 Jun 2013 15:31:44 -0000

Author: mav
Date: Tue Jun 18 15:31:43 2013
New Revision: 251951
URL: http://svnweb.freebsd.org/changeset/base/251951

Log:
  Remove diff from head after manual r251942 merge.
  
  Reviewed by:	scottl

Modified:
  stable/9/sys/kern/kern_physio.c

Modified: stable/9/sys/kern/kern_physio.c
==============================================================================
--- stable/9/sys/kern/kern_physio.c	Tue Jun 18 15:22:16 2013	(r251950)
+++ stable/9/sys/kern/kern_physio.c	Tue Jun 18 15:31:43 2013	(r251951)
@@ -38,7 +38,7 @@ physio(struct cdev *dev, struct uio *uio
 	struct cdevsw *csw;
 	caddr_t sa;
 	u_int iolen;
-	int error, i;
+	int error, i, mapped;
 
 	/* Keep the process UPAGES from being swapped. XXX: why ? */
 	PHOLD(curproc);
@@ -90,10 +90,9 @@ physio(struct cdev *dev, struct uio *uio
 			bp->b_bufsize = bp->b_bcount;
 
 			bp->b_blkno = btodb(bp->b_offset);
+
 			csw = dev->si_devsw;
 			if (uio->uio_segflg == UIO_USERSPACE) {
-				int mapped;
-
 				if (csw != NULL &&
                                     (csw->d_flags & D_UNMAPPED_IO) != 0)
 					mapped = 0;