From 72b69cb7789eb0b9fc74313ca45f34ff66216ce0 Mon Sep 17 00:00:00 2001 From: mav Date: Tue, 18 Jun 2013 15:31:43 +0000 Subject: [PATCH] Remove diff from head after manual r251942 merge. Reviewed by: scottl git-svn-id: svn://svn.freebsd.org/base/stable/9@251951 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- sys/kern/kern_physio.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/kern/kern_physio.c b/sys/kern/kern_physio.c index 957559377..1387c8e79 100644 --- a/sys/kern/kern_physio.c +++ b/sys/kern/kern_physio.c @@ -38,7 +38,7 @@ physio(struct cdev *dev, struct uio *uio, int ioflag) 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, int ioflag) 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; -- 2.45.0