 @@ -1,255 +1,256 @@
-/*	$NetBSD: conf.h,v 1.134 2009/02/02 14:00:27 haad Exp $	*/
+/*	$NetBSD: conf.h,v 1.135 2009/06/20 19:24:27 mrg Exp $	*/
 /*-
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
  * (c) UNIX System Laboratories, Inc.
  * All or some portions of this file are derived from material licensed
  * to the University of California by American Telephone and Telegraph
  * Co. or Unix System Laboratories, Inc. and are reproduced herein with
  * the permission of UNIX System Laboratories, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)conf.h	8.5 (Berkeley) 1/9/95
  */
 #ifndef _SYS_CONF_H_
 #define _SYS_CONF_H_
 /*
  * Definitions of device driver entry switches
  */
 #include <sys/queue.h>
 struct buf;
 struct knote;
 struct lwp;
 struct tty;
 struct uio;
 struct vnode;
 /*
  * Types for d_type
  */
 #define D_OTHER		0x0000
 #define	D_TAPE		0x0001
 #define	D_DISK		0x0002
 #define	D_TTY		0x0003
 #define	D_TYPEMASK	0x00ff
 #define	D_MPSAFE	0x0100
 #define	D_NEGOFFSAFE	0x0200
 /*
  * Block device switch table
  */
 struct bdevsw {
 	int		(*d_open)(dev_t, int, int, struct lwp *);
 	int		(*d_close)(dev_t, int, int, struct lwp *);
 	void		(*d_strategy)(struct buf *);
 	int		(*d_ioctl)(dev_t, u_long, void *, int, struct lwp *);
 	int		(*d_dump)(dev_t, daddr_t, void *, size_t);
 	int		(*d_psize)(dev_t);
 	int		d_flag;
 };
 /*
  * Character device switch table
  */
 struct cdevsw {
 	int		(*d_open)(dev_t, int, int, struct lwp *);
 	int		(*d_close)(dev_t, int, int, struct lwp *);
 	int		(*d_read)(dev_t, struct uio *, int);
 	int		(*d_write)(dev_t, struct uio *, int);
 	int		(*d_ioctl)(dev_t, u_long, void *, int, struct lwp *);
 	void		(*d_stop)(struct tty *, int);
 	struct tty *	(*d_tty)(dev_t);
 	int		(*d_poll)(dev_t, int, struct lwp *);
 	paddr_t		(*d_mmap)(dev_t, off_t, int);
 	int		(*d_kqfilter)(dev_t, struct knote *);
 	int		d_flag;
 };
 #ifdef _KERNEL
 #include <sys/mutex.h>
 extern kmutex_t device_lock;
 int devsw_attach(const char *, const struct bdevsw *, devmajor_t *,
 		 const struct cdevsw *, devmajor_t *);
 int devsw_detach(const struct bdevsw *, const struct cdevsw *);
 const struct bdevsw *bdevsw_lookup(dev_t);
 const struct cdevsw *cdevsw_lookup(dev_t);
 devmajor_t bdevsw_lookup_major(const struct bdevsw *);
 devmajor_t cdevsw_lookup_major(const struct cdevsw *);
 #define	dev_type_open(n)	int n (dev_t, int, int, struct lwp *)
 #define	dev_type_close(n)	int n (dev_t, int, int, struct lwp *)
 #define	dev_type_read(n)	int n (dev_t, struct uio *, int)
 #define	dev_type_write(n)	int n (dev_t, struct uio *, int)
 #define	dev_type_ioctl(n) \
 		int n (dev_t, u_long, void *, int, struct lwp *)
 #define	dev_type_stop(n)	void n (struct tty *, int)
 #define	dev_type_tty(n)		struct tty * n (dev_t)
 #define	dev_type_poll(n)	int n (dev_t, int, struct lwp *)
 #define	dev_type_mmap(n)	paddr_t n (dev_t, off_t, int)
 #define	dev_type_strategy(n)	void n (struct buf *)
 #define	dev_type_dump(n)	int n (dev_t, daddr_t, void *, size_t)
 #define	dev_type_size(n)	int n (dev_t)
 #define	dev_type_kqfilter(n)	int n (dev_t, struct knote *)
 #define	noopen		((dev_type_open((*)))enodev)
 #define	noclose		((dev_type_close((*)))enodev)
 #define	noread		((dev_type_read((*)))enodev)
 #define	nowrite		((dev_type_write((*)))enodev)
 #define	noioctl		((dev_type_ioctl((*)))enodev)
 #define	nostop		((dev_type_stop((*)))enodev)
 #define	notty		NULL
 #define	nopoll		seltrue
 #define	nommap		((dev_type_mmap((*)))enodev)
 #define	nodump		((dev_type_dump((*)))enodev)
 #define	nosize		NULL
 #define	nokqfilter	seltrue_kqfilter
 #define	nullopen	((dev_type_open((*)))nullop)
 #define	nullclose	((dev_type_close((*)))nullop)
 #define	nullread	((dev_type_read((*)))nullop)
 #define	nullwrite	((dev_type_write((*)))nullop)
 #define	nullioctl	((dev_type_ioctl((*)))nullop)
 #define	nullstop	((dev_type_stop((*)))nullop)
 #define	nullpoll	((dev_type_poll((*)))nullop)
 #define	nullmmap	((dev_type_mmap((*)))nullop)
 #define	nulldump	((dev_type_dump((*)))nullop)
 #define	nullkqfilter	((dev_type_kqfilter((*)))eopnotsupp)
 /* device access wrappers. */
 dev_type_open(bdev_open);
 dev_type_close(bdev_close);
 dev_type_strategy(bdev_strategy);
 dev_type_ioctl(bdev_ioctl);
 dev_type_dump(bdev_dump);
 dev_type_open(cdev_open);
 dev_type_close(cdev_close);
 dev_type_read(cdev_read);
 dev_type_write(cdev_write);
 dev_type_ioctl(cdev_ioctl);
 dev_type_stop(cdev_stop);
 dev_type_tty(cdev_tty);
 dev_type_poll(cdev_poll);
 dev_type_mmap(cdev_mmap);
 dev_type_kqfilter(cdev_kqfilter);
 int	cdev_type(dev_t);
 int	bdev_type(dev_t);
 /* symbolic sleep message strings */
 extern	const char devopn[], devio[], devwait[], devin[], devout[];
 extern	const char devioc[], devcls[];
 #endif /* _KERNEL */
 /*
  * Line discipline switch table
  */
 struct linesw {
 	const char *l_name;	/* Linesw name */
 	LIST_ENTRY(linesw) l_list;
 	u_int	l_refcnt;	/* locked by ttyldisc_list_slock */
 	int	l_no;		/* legacy discipline number (for TIOCGETD) */
 	int	(*l_open)	(dev_t, struct tty *);
 	int	(*l_close)	(struct tty *, int);
 	int	(*l_read)	(struct tty *, struct uio *, int);
 	int	(*l_write)	(struct tty *, struct uio *, int);
 	int	(*l_ioctl)	(struct tty *, u_long, void *, int,
 				    struct lwp *);
 	int	(*l_rint)	(int, struct tty *);
 	int	(*l_start)	(struct tty *);
 	int	(*l_modem)	(struct tty *, int);
 	int	(*l_poll)	(struct tty *, int, struct lwp *);
 };
 #ifdef _KERNEL
 void	       ttyldisc_init(void);
 int	       ttyldisc_attach(struct linesw *);
 int	       ttyldisc_detach(struct linesw *);
 struct linesw *ttyldisc_lookup(const char *);
 struct linesw *ttyldisc_lookup_bynum(int);
 struct linesw *ttyldisc_default(void);
 void	       ttyldisc_release(struct linesw *);
 /* For those defining their own line disciplines: */
 #define	ttynodisc ((int (*)(dev_t, struct tty *))enodev)
 #define	ttyerrclose ((int (*)(struct tty *, int))enodev)
 #define	ttyerrio ((int (*)(struct tty *, struct uio *, int))enodev)
 #define	ttyerrinput ((int (*)(int, struct tty *))enodev)
 #define	ttyerrstart ((int (*)(struct tty *))enodev)
 int	ttyerrpoll (struct tty *, int, struct lwp *);
 int	ttynullioctl(struct tty *, u_long, void *, int, struct lwp *);
 int	iskmemdev(dev_t);
 int	seltrue_kqfilter(dev_t, struct knote *);
 #endif
 #ifdef _KERNEL
 #define	DEV_MEM		0	/* minor device 0 is physical memory */
 #define	DEV_KMEM	1	/* minor device 1 is kernel memory */
 #define	DEV_NULL	2	/* minor device 2 is EOF/rathole */
 #ifdef COMPAT_16
 #define	_DEV_ZERO_oARM	3	/* reserved: old ARM /dev/zero minor */
 #endif
 #define	DEV_ZERO	12	/* minor device 12 is '\0'/rathole */
 #endif /* _KERNEL */
 struct devsw_conv {
 	const char *d_name;
 	devmajor_t d_bmajor;
 	devmajor_t d_cmajor;
 };
 #ifdef _KERNEL
 void devsw_init(void);
 const char *devsw_blk2name(devmajor_t);
 const char *cdevsw_getname(devmajor_t);
 const char *bdevsw_getname(devmajor_t);
 devmajor_t devsw_name2blk(const char *, char *, size_t);
 devmajor_t devsw_name2chr(const char *, char *, size_t);
 dev_t devsw_chr2blk(dev_t);
 dev_t devsw_blk2chr(dev_t);
 #endif /* _KERNEL */
 #ifdef _KERNEL
 struct	device;
 void	setroot(struct device *, int);
 void	swapconf(void);
 #endif /* _KERNEL */
 #endif /* !_SYS_CONF_H_ */

 @@ -1,452 +1,453 @@
-/*	$NetBSD: uvm_device.c,v 1.55 2008/12/17 20:51:39 cegger Exp $	*/
+/*	$NetBSD: uvm_device.c,v 1.56 2009/06/20 19:24:27 mrg Exp $	*/
 /*
+ *
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *      This product includes software developed by Charles D. Cranor and
  *      Washington University.
  * 4. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  * from: Id: uvm_device.c,v 1.1.2.9 1998/02/06 05:11:47 chs Exp
  */
 /*
  * uvm_device.c: the device pager.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_device.c,v 1.55 2008/12/17 20:51:39 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_device.c,v 1.56 2009/06/20 19:24:27 mrg Exp $");
 #include "opt_uvmhist.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/vnode.h>
 #include <uvm/uvm.h>
 #include <uvm/uvm_device.h>
 /*
  * private global data structure
+ *
  * we keep a list of active device objects in the system.
  */
 LIST_HEAD(udv_list_struct, uvm_device);
 static struct udv_list_struct udv_list;
 static kmutex_t udv_lock;
 /*
  * functions
  */
 static void	udv_init(void);
 static void	udv_reference(struct uvm_object *);
 static void	udv_detach(struct uvm_object *);
 static int	udv_fault(struct uvm_faultinfo *, vaddr_t,
 			  struct vm_page **, int, int, vm_prot_t,
 			  int);
 /*
  * master pager structure
  */
 const struct uvm_pagerops uvm_deviceops = {
 	.pgo_init = udv_init,
 	.pgo_reference = udv_reference,
 	.pgo_detach = udv_detach,
 	.pgo_fault = udv_fault,
 };
 /*
  * the ops!
  */
 /*
  * udv_init
+ *
  * init pager private data structures.
  */
 static void
 udv_init(void)
+{
 	LIST_INIT(&udv_list);
 	mutex_init(&udv_lock, MUTEX_DEFAULT, IPL_NONE);
+}
 /*
  * udv_attach
+ *
  * get a VM object that is associated with a device.   allocate a new
  * one if needed.
+ *
  * => caller must _not_ already be holding the lock on the uvm_object.
  * => in fact, nothing should be locked so that we can sleep here.
  */
 struct uvm_object *
 udv_attach(void *arg, vm_prot_t accessprot,
     voff_t off,		/* used only for access check */
     vsize_t size	/* used only for access check */)
+{
 	dev_t device = *((dev_t *)arg);
 	struct uvm_device *udv, *lcv;
 	const struct cdevsw *cdev;
 	dev_type_mmap((*mapfn));
 	UVMHIST_FUNC("udv_attach"); UVMHIST_CALLED(maphist);
 	UVMHIST_LOG(maphist, "(device=0x%x)", device,0,0,0);
 	/*
 	 * before we do anything, ensure this device supports mmap
 	 */
 	cdev = cdevsw_lookup(device);
 	if (cdev == NULL) {
 		return (NULL);
+	}
 	mapfn = cdev->d_mmap;
 	if (mapfn == NULL || mapfn == nommap || mapfn == nullmmap) {
 		return(NULL);
+	}
 	/*
 	 * Negative offsets on the object are not allowed.
 	 */
-	if (off != UVM_UNKNOWN_OFFSET && off < 0)
+	if ((cdev->d_flag & D_NEGOFFSAFE) == 0 &&
 	    off != UVM_UNKNOWN_OFFSET && off < 0)
 		return(NULL);
 	/*
 	 * Check that the specified range of the device allows the
 	 * desired protection.
+	 *
 	 * XXX assumes VM_PROT_* == PROT_*
 	 * XXX clobbers off and size, but nothing else here needs them.
 	 */
 	while (size != 0) {
 		if (cdev_mmap(device, off, accessprot) == -1) {
 			return (NULL);
+		}
 		off += PAGE_SIZE; size -= PAGE_SIZE;
+	}
 	/*
 	 * keep looping until we get it
 	 */
 	for (;;) {
 		/*
 		 * first, attempt to find it on the main list
 		 */
 		mutex_enter(&udv_lock);
 		LIST_FOREACH(lcv, &udv_list, u_list) {
 			if (device == lcv->u_device)
 				break;
+		}
 		/*
 		 * got it on main list.  put a hold on it and unlock udv_lock.
 		 */
 		if (lcv) {
 			/*
 			 * if someone else has a hold on it, sleep and start
 			 * over again.
 			 */
 			if (lcv->u_flags & UVM_DEVICE_HOLD) {
 				lcv->u_flags |= UVM_DEVICE_WANTED;
 				UVM_UNLOCK_AND_WAIT(lcv, &udv_lock, false,
 				    "udv_attach",0);
 				continue;
+			}
 			/* we are now holding it */
 			lcv->u_flags |= UVM_DEVICE_HOLD;
 			mutex_exit(&udv_lock);
 			/*
 			 * bump reference count, unhold, return.
 			 */
 			mutex_enter(&lcv->u_obj.vmobjlock);
 			lcv->u_obj.uo_refs++;
 			mutex_exit(&lcv->u_obj.vmobjlock);
 			mutex_enter(&udv_lock);
 			if (lcv->u_flags & UVM_DEVICE_WANTED)
 				wakeup(lcv);
 			lcv->u_flags &= ~(UVM_DEVICE_WANTED|UVM_DEVICE_HOLD);
 			mutex_exit(&udv_lock);
 			return(&lcv->u_obj);
+		}
 		/*
 		 * did not find it on main list.   need to malloc a new one.
 		 */
 		mutex_exit(&udv_lock);
 		/* NOTE: we could sleep in the following malloc() */
 		udv = malloc(sizeof(*udv), M_TEMP, M_WAITOK);
 		mutex_enter(&udv_lock);
 		/*
 		 * now we have to double check to make sure no one added it
 		 * to the list while we were sleeping...
 		 */
 		LIST_FOREACH(lcv, &udv_list, u_list) {
 			if (device == lcv->u_device)
 				break;
+		}
 		/*
 		 * did we lose a race to someone else?
 		 * free our memory and retry.
 		 */
 		if (lcv) {
 			mutex_exit(&udv_lock);
 			free(udv, M_TEMP);
 			continue;
+		}
 		/*
 		 * we have it!   init the data structures, add to list
 		 * and return.
 		 */
 		UVM_OBJ_INIT(&udv->u_obj, &uvm_deviceops, 1);
 		udv->u_flags = 0;
 		udv->u_device = device;
 		LIST_INSERT_HEAD(&udv_list, udv, u_list);
 		mutex_exit(&udv_lock);
 		return(&udv->u_obj);
+	}
 	/*NOTREACHED*/
+}
 /*
  * udv_reference
+ *
  * add a reference to a VM object.   Note that the reference count must
  * already be one (the passed in reference) so there is no chance of the
  * udv being released or locked out here.
+ *
  * => caller must call with object unlocked.
  */
 static void
 udv_reference(struct uvm_object *uobj)
+{
 	UVMHIST_FUNC("udv_reference"); UVMHIST_CALLED(maphist);
 	mutex_enter(&uobj->vmobjlock);
 	uobj->uo_refs++;
 	UVMHIST_LOG(maphist, "<- done (uobj=0x%x, ref = %d)",
 		    uobj, uobj->uo_refs,0,0);
 	mutex_exit(&uobj->vmobjlock);
+}
 /*
  * udv_detach
+ *
  * remove a reference to a VM object.
+ *
  * => caller must call with object unlocked and map locked.
  */
 static void
 udv_detach(struct uvm_object *uobj)
+{
 	struct uvm_device *udv = (struct uvm_device *)uobj;
 	UVMHIST_FUNC("udv_detach"); UVMHIST_CALLED(maphist);
 	/*
 	 * loop until done
 	 */
 again:
 	mutex_enter(&uobj->vmobjlock);
 	if (uobj->uo_refs > 1) {
 		uobj->uo_refs--;
 		mutex_exit(&uobj->vmobjlock);
 		UVMHIST_LOG(maphist," <- done, uobj=0x%x, ref=%d",
 			  uobj,uobj->uo_refs,0,0);
 		return;
+	}
 	/*
 	 * is it being held?   if so, wait until others are done.
 	 */
 	mutex_enter(&udv_lock);
 	if (udv->u_flags & UVM_DEVICE_HOLD) {
 		udv->u_flags |= UVM_DEVICE_WANTED;
 		mutex_exit(&uobj->vmobjlock);
 		UVM_UNLOCK_AND_WAIT(udv, &udv_lock, false, "udv_detach",0);
 		goto again;
+	}
 	/*
 	 * got it!   nuke it now.
 	 */
 	LIST_REMOVE(udv, u_list);
 	if (udv->u_flags & UVM_DEVICE_WANTED)
 		wakeup(udv);
 	mutex_exit(&udv_lock);
 	mutex_exit(&uobj->vmobjlock);
 	UVM_OBJ_DESTROY(uobj);
 	free(udv, M_TEMP);
 	UVMHIST_LOG(maphist," <- done, freed uobj=0x%x", uobj,0,0,0);
+}
 /*
  * udv_fault: non-standard fault routine for device "pages"
+ *
  * => rather than having a "get" function, we have a fault routine
  *	since we don't return vm_pages we need full control over the
  *	pmap_enter map in
  * => all the usual fault data structured are locked by the caller
  *	(i.e. maps(read), amap (if any), uobj)
  * => on return, we unlock all fault data structures
  * => flags: PGO_ALLPAGES: get all of the pages
  *	     PGO_LOCKED: fault data structures are locked
  *    XXX: currently PGO_LOCKED is always required ... consider removing
  *	it as a flag
  * => NOTE: vaddr is the VA of pps[0] in ufi->entry, _NOT_ pps[centeridx]
  */
 static int
 udv_fault(struct uvm_faultinfo *ufi, vaddr_t vaddr, struct vm_page **pps,
     int npages, int centeridx, vm_prot_t access_type,
     int flags)
+{
 	struct vm_map_entry *entry = ufi->entry;
 	struct uvm_object *uobj = entry->object.uvm_obj;
 	struct uvm_device *udv = (struct uvm_device *)uobj;
 	vaddr_t curr_va;
 	off_t curr_offset;
 	paddr_t paddr, mdpgno;
 	int lcv, retval;
 	dev_t device;
 	vm_prot_t mapprot;
 	UVMHIST_FUNC("udv_fault"); UVMHIST_CALLED(maphist);
 	UVMHIST_LOG(maphist,"  flags=%d", flags,0,0,0);
 	/*
 	 * we do not allow device mappings to be mapped copy-on-write
 	 * so we kill any attempt to do so here.
 	 */
 	if (UVM_ET_ISCOPYONWRITE(entry)) {
 		UVMHIST_LOG(maphist, "<- failed -- COW entry (etype=0x%x)",
 		entry->etype, 0,0,0);
 		uvmfault_unlockall(ufi, ufi->entry->aref.ar_amap, uobj, NULL);
 		return(EIO);
+	}
 	/*
 	 * get device map function.
 	 */
 	device = udv->u_device;
 	if (cdevsw_lookup(device) == NULL) {
 		/* XXX This should not happen */
 		uvmfault_unlockall(ufi, ufi->entry->aref.ar_amap, uobj, NULL);
 		return (EIO);
+	}
 	/*
 	 * now we must determine the offset in udv to use and the VA to
 	 * use for pmap_enter.  note that we always use orig_map's pmap
 	 * for pmap_enter (even if we have a submap).   since virtual
 	 * addresses in a submap must match the main map, this is ok.
 	 */
 	/* udv offset = (offset from start of entry) + entry's offset */
 	curr_offset = entry->offset + (vaddr - entry->start);
 	/* pmap va = vaddr (virtual address of pps[0]) */
 	curr_va = vaddr;
 	/*
 	 * loop over the page range entering in as needed
 	 */
 	retval = 0;
 	for (lcv = 0 ; lcv < npages ; lcv++, curr_offset += PAGE_SIZE,
 	    curr_va += PAGE_SIZE) {
 		if ((flags & PGO_ALLPAGES) == 0 && lcv != centeridx)
 			continue;
 		if (pps[lcv] == PGO_DONTCARE)
 			continue;
 		mdpgno = cdev_mmap(device, curr_offset, access_type);
 		if (mdpgno == -1) {
 			retval = EIO;
 			break;
+		}
 		paddr = pmap_phys_address(mdpgno);
 		mapprot = ufi->entry->protection;
 		UVMHIST_LOG(maphist,
 		    "  MAPPING: device: pm=0x%x, va=0x%x, pa=0x%lx, at=%d",
 		    ufi->orig_map->pmap, curr_va, paddr, mapprot);
 		if (pmap_enter(ufi->orig_map->pmap, curr_va, paddr,
 		    mapprot, PMAP_CANFAIL | mapprot) != 0) {
 			/*
 			 * pmap_enter() didn't have the resource to
 			 * enter this mapping.  Unlock everything,
 			 * wait for the pagedaemon to free up some
 			 * pages, and then tell uvm_fault() to start
 			 * the fault again.
+			 *
 			 * XXX Needs some rethinking for the PGO_ALLPAGES
 			 * XXX case.
 			 */
 			pmap_update(ufi->orig_map->pmap);	/* sync what we have so far */
 			uvmfault_unlockall(ufi, ufi->entry->aref.ar_amap,
 			    uobj, NULL);
 			uvm_wait("udv_fault");
 			return (ERESTART);
+		}
+	}
 	pmap_update(ufi->orig_map->pmap);
 	uvmfault_unlockall(ufi, ufi->entry->aref.ar_amap, uobj, NULL);
 	return (retval);
+}