[src/trunk]: src/sys/uvm The diagnostic function uvm_km_check_empty() takes a...

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

details:   https://anonhg.NetBSD.org/src/rev/00a891cb63a6
branches:  trunk
changeset: 335947:00a891cb63a6
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Feb 01 16:26:00 2015 +0000

description:
The diagnostic function uvm_km_check_empty() takes a mutex, so don't call it
if we are using UVM_FLAG_NOWAIT.

diffstat:

 sys/uvm/uvm_map.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 8d3a39b9086e -r 00a891cb63a6 sys/uvm/uvm_map.c
--- a/sys/uvm/uvm_map.c Sun Feb 01 15:24:15 2015 +0000
+++ b/sys/uvm/uvm_map.c Sun Feb 01 16:26:00 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_map.c,v 1.332 2015/01/23 16:13:53 chs Exp $        */
+/*     $NetBSD: uvm_map.c,v 1.333 2015/02/01 16:26:00 christos 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.332 2015/01/23 16:13:53 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.333 2015/02/01 16:26:00 christos Exp $");
 
 #include "opt_ddb.h"
 #include "opt_uvmhist.h"
@@ -1078,7 +1078,7 @@
        }
 
 #if defined(DEBUG)
-       if (!error && VM_MAP_IS_KERNEL(map)) {
+       if (!error && VM_MAP_IS_KERNEL(map) && (flags & UVM_FLAG_NOWAIT) == 0) {
                uvm_km_check_empty(map, *startp, *startp + size);
        }
 #endif /* defined(DEBUG) */
@@ -2253,7 +2253,7 @@
                        }
                }
 
-               if (VM_MAP_IS_KERNEL(map)) {
+               if (VM_MAP_IS_KERNEL(map) && (flags & UVM_FLAG_NOWAIT) == 0) {
                        uvm_km_check_empty(map, entry->start,
                            entry->end);
                }