[src/netbsd-1-6]: src/sys/kern Pull up revision 1.31 (requested by junyoung i...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a1e861c12e50
branches:  netbsd-1-6
changeset: 530783:a1e861c12e50
user:      tron <tron%NetBSD.org@localhost>
date:      Thu Oct 02 09:53:46 2003 +0000

description:
Pull up revision 1.31 (requested by junyoung in ticket #1488):
count executable image pages as executable for vm-usage purposes.
also, always do the VTEXT vs. v_writecount mutual exclusion
(which we previously skipped if the text or data segment was empty).

diffstat:

 sys/kern/exec_subr.c |  7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diffs (29 lines):

diff -r 8fc1ab6de48f -r a1e861c12e50 sys/kern/exec_subr.c
--- a/sys/kern/exec_subr.c      Thu Oct 02 09:53:41 2003 +0000
+++ b/sys/kern/exec_subr.c      Thu Oct 02 09:53:46 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: exec_subr.c,v 1.29 2001/11/12 15:25:04 lukem Exp $     */
+/*     $NetBSD: exec_subr.c,v 1.29.10.1 2003/10/02 09:53:46 tron Exp $ */
 
 /*
  * Copyright (c) 1993, 1994, 1996 Christopher G. Demetriou
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exec_subr.c,v 1.29 2001/11/12 15:25:04 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exec_subr.c,v 1.29.10.1 2003/10/02 09:53:46 tron Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -139,10 +139,7 @@
        struct uvm_object *uobj;
        int error;
 
-#if 0
-       /* XXX not true for eg. ld.elf_so */
        KASSERT(cmd->ev_vp->v_flag & VTEXT);
-#endif
 
        /*
         * map the vnode in using uvm_map.