Module Name: src
Committed By: para
Date: Mon Oct 29 16:00:05 UTC 2012
Modified Files:
src/sys/uvm: uvm_map.c uvm_map.h
src/usr.bin/pmap: pmap.c
Log Message:
get rid of not used uvm_map flag (UVM_MAP_KMAPENT)
To generate a diff of this commit:
cvs rdiff -u -r1.322 -r1.323 src/sys/uvm/uvm_map.c
cvs rdiff -u -r1.71 -r1.72 src/sys/uvm/uvm_map.h
cvs rdiff -u -r1.49 -r1.50 src/usr.bin/pmap/pmap.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_map.c
diff -u src/sys/uvm/uvm_map.c:1.322 src/sys/uvm/uvm_map.c:1.323
--- src/sys/uvm/uvm_map.c:1.322 Tue Sep 4 13:37:42 2012
+++ src/sys/uvm/uvm_map.c Mon Oct 29 16:00:05 2012
@@ -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 @@ uvm_unmap_remove(struct vm_map *map, vad
*/
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 @@ uvm_unmap_remove(struct vm_map *map, vad
}
#if defined(DEBUG)
- if ((entry->flags & UVM_MAP_KMAPENT) == 0) {
-
- /*
- * check if there's remaining mapping,
- * which is a bug in caller.
- */
+ /*
+ * 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);
- }
+ 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) */
Index: src/sys/uvm/uvm_map.h
diff -u src/sys/uvm/uvm_map.h:1.71 src/sys/uvm/uvm_map.h:1.72
--- src/sys/uvm/uvm_map.h:1.71 Sun Feb 19 00:05:56 2012
+++ src/sys/uvm/uvm_map.h Mon Oct 29 16:00:05 2012
@@ -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 @@ struct vm_map_entry {
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 */
Index: src/usr.bin/pmap/pmap.c
diff -u src/usr.bin/pmap/pmap.c:1.49 src/usr.bin/pmap/pmap.c:1.50
--- src/usr.bin/pmap/pmap.c:1.49 Sun Feb 19 02:47:53 2012
+++ src/usr.bin/pmap/pmap.c Mon Oct 29 16:00:05 2012
@@ -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 @@ dump_vm_map_entry(kvm_t *kd, struct kinf
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" : "");
}
