[src/trunk]: src get rid of not used uvm_map flag (UVM_MAP_KMAPENT)

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

details:   https://anonhg.NetBSD.org/src/rev/e5d833bfa3b5
branches:  trunk
changeset: 782350:e5d833bfa3b5
user:      para <para%NetBSD.org@localhost>
date:      Mon Oct 29 16:00:05 2012 +0000

description:
get rid of not used uvm_map flag (UVM_MAP_KMAPENT)

diffstat:

 sys/uvm/uvm_map.c   |  44 +++++++++++++++++++-------------------------
 sys/uvm/uvm_map.h   |   3 +--
 usr.bin/pmap/pmap.c |   5 ++---
 3 files changed, 22 insertions(+), 30 deletions(-)

diffs (116 lines):

diff -r 2e1f36664280 -r e5d833bfa3b5 sys/uvm/uvm_map.c
--- a/sys/uvm/uvm_map.c Mon Oct 29 14:13:22 2012 +0000
+++ b/sys/uvm/uvm_map.c Mon Oct 29 16:00:05 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_map.c,v 1.322 2012/09/04 13:37:42 matt Exp $       */
+/*     $NetBSD: uvm_map.c,v 1.323 2012/10/29 16:00:05 para Exp $       */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.322 2012/09/04 13:37:42 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.323 2012/10/29 16:00:05 para Exp $");
 
 #include "opt_ddb.h"
 #include "opt_uvmhist.h"
@@ -2221,10 +2221,7 @@
                         */
                        KASSERT(vm_map_pmap(map) == pmap_kernel());
 
-                       if ((entry->flags & UVM_MAP_KMAPENT) == 0) {
-                               uvm_km_pgremove_intrsafe(map, entry->start,
-                                   entry->end);
-                       }
+                       uvm_km_pgremove_intrsafe(map, entry->start, entry->end);
                } else if (UVM_ET_ISOBJ(entry) &&
                           UVM_OBJ_IS_KERN_OBJECT(entry->object.uvm_obj)) {
                        panic("%s: kernel object %p %p\n",
@@ -2242,26 +2239,23 @@
                }
 
 #if defined(DEBUG)
-               if ((entry->flags & UVM_MAP_KMAPENT) == 0) {
-
-                       /*
-                        * check if there's remaining mapping,
-                        * which is a bug in caller.
-                        */
-
-                       vaddr_t va;
-                       for (va = entry->start; va < entry->end;
-                           va += PAGE_SIZE) {
-                               if (pmap_extract(vm_map_pmap(map), va, NULL)) {
-                                       panic("%s: %#"PRIxVADDR" has mapping",
-                                           __func__, va);
-                               }
+               /*
+                * check if there's remaining mapping,
+                * which is a bug in caller.
+                */
+
+               vaddr_t va;
+               for (va = entry->start; va < entry->end;
+                   va += PAGE_SIZE) {
+                       if (pmap_extract(vm_map_pmap(map), va, NULL)) {
+                               panic("%s: %#"PRIxVADDR" has mapping",
+                                   __func__, va);
                        }
-
-                       if (VM_MAP_IS_KERNEL(map)) {
-                               uvm_km_check_empty(map, entry->start,
-                                   entry->end);
-                       }
+               }
+
+               if (VM_MAP_IS_KERNEL(map)) {
+                       uvm_km_check_empty(map, entry->start,
+                           entry->end);
                }
 #endif /* defined(DEBUG) */
 
diff -r 2e1f36664280 -r e5d833bfa3b5 sys/uvm/uvm_map.h
--- a/sys/uvm/uvm_map.h Mon Oct 29 14:13:22 2012 +0000
+++ b/sys/uvm/uvm_map.h Mon Oct 29 16:00:05 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_map.h,v 1.71 2012/02/19 00:05:56 rmind Exp $       */
+/*     $NetBSD: uvm_map.h,v 1.72 2012/10/29 16:00:05 para Exp $        */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -150,7 +150,6 @@
        u_int8_t                flags;          /* flags */
 
 #define        UVM_MAP_KERNEL          0x01            /* kernel map entry */
-#define        UVM_MAP_KMAPENT         0x02            /* contains map entries */
 #define        UVM_MAP_STATIC          0x04            /* special static entries */
 #define        UVM_MAP_NOMERGE         0x08            /* this entry is not mergable */
 
diff -r 2e1f36664280 -r e5d833bfa3b5 usr.bin/pmap/pmap.c
--- a/usr.bin/pmap/pmap.c       Mon Oct 29 14:13:22 2012 +0000
+++ b/usr.bin/pmap/pmap.c       Mon Oct 29 16:00:05 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.49 2012/02/19 02:47:53 rmind Exp $ */
+/*     $NetBSD: pmap.c,v 1.50 2012/10/29 16:00:05 para Exp $ */
 
 /*
  * Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: pmap.c,v 1.49 2012/02/19 02:47:53 rmind Exp $");
+__RCSID("$NetBSD: pmap.c,v 1.50 2012/10/29 16:00:05 para Exp $");
 #endif
 
 #include <string.h>
@@ -304,7 +304,6 @@
                printf("%*s    flags = %x <%s%s%s%s > }\n", indent(2), "",
                       vme->flags,
                       vme->flags & UVM_MAP_KERNEL ? " KERNEL" : "",
-                      vme->flags & UVM_MAP_KMAPENT ? " KMAPENT" : "",
                       vme->flags & UVM_MAP_STATIC ? " STATIC" : "",
                       vme->flags & UVM_MAP_NOMERGE ? " NOMERGE" : "");
        }