Module Name: src
Committed By: yamt
Date: Tue Aug 18 02:41:31 UTC 2009
Modified Files:
src/sys/uvm: uvm_mmap.c
Log Message:
uvm_mmap: remove a dead conditional.
To generate a diff of this commit:
cvs rdiff -u -r1.130 -r1.131 src/sys/uvm/uvm_mmap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/uvm/uvm_mmap.c
diff -u src/sys/uvm/uvm_mmap.c:1.130 src/sys/uvm/uvm_mmap.c:1.131
--- src/sys/uvm/uvm_mmap.c:1.130 Wed Jun 10 01:55:33 2009
+++ src/sys/uvm/uvm_mmap.c Tue Aug 18 02:41:31 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_mmap.c,v 1.130 2009/06/10 01:55:33 yamt Exp $ */
+/* $NetBSD: uvm_mmap.c,v 1.131 2009/08/18 02:41:31 yamt Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_mmap.c,v 1.130 2009/06/10 01:55:33 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_mmap.c,v 1.131 2009/08/18 02:41:31 yamt Exp $");
#include "opt_compat_netbsd.h"
#include "opt_pax.h"
@@ -1166,10 +1166,10 @@
(i & ~VM_PROT_WRITE), foff, size);
i--;
} while ((uobj == NULL) && (i > 0));
+ if (uobj == NULL)
+ return EINVAL;
advice = UVM_ADV_RANDOM;
}
- if (uobj == NULL)
- return((vp->v_type == VREG) ? ENOMEM : EINVAL);
if ((flags & MAP_SHARED) == 0) {
uvmflag |= UVM_FLAG_COPYONW;
}
