Re: PR/49328 CVS commit: src/sys/dev/pci/ixgbe

[christos%zoulas.com@localhost (Christos Zoulas)]

On Jan 30,  9:01am, 6bone%6bone.informatik.uni-leipzig.de@localhost (6bone%6bone.informatik.uni-leipzig.de@localhost) wrote:
-- Subject: Re: PR/49328 CVS commit: src/sys/dev/pci/ixgbe

| On Wed, 28 Jan 2015, Christos Zoulas wrote:
| >
| > To generate a diff of this commit:
| > cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pci/ixgbe/ixgbe_netbsd.c
| >
| 
| I have the patch generated and applied to the netbsd-7 kernel. The problem 
| is not solved.

Add this to it:

christos

Index: uvm_map.c
===================================================================
RCS file: /cvsroot/src/sys/uvm/uvm_map.c,v
retrieving revision 1.331
diff -u -u -r1.331 uvm_map.c
--- uvm_map.c	26 Oct 2014 01:42:07 -0000	1.331
+++ uvm_map.c	30 Jan 2015 12:43:58 -0000
@@ -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);
 		}