Module Name: src
Committed By: rin
Date: Fri Nov 1 13:04:23 UTC 2019
Modified Files:
src/sys/uvm: uvm_map.c
Log Message:
Fix previous; semantics of align argument of uvm_map() is different
when UVM_FLAG_COLORMATCH is specified.
Should fix PR kern/54669.
To generate a diff of this commit:
cvs rdiff -u -r1.365 -r1.366 src/sys/uvm/uvm_map.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.365 src/sys/uvm/uvm_map.c:1.366
--- src/sys/uvm/uvm_map.c:1.365 Fri Nov 1 08:26:18 2019
+++ src/sys/uvm/uvm_map.c Fri Nov 1 13:04:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_map.c,v 1.365 2019/11/01 08:26:18 rin Exp $ */
+/* $NetBSD: uvm_map.c,v 1.366 2019/11/01 13:04:22 rin 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.365 2019/11/01 08:26:18 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.366 2019/11/01 13:04:22 rin Exp $");
#include "opt_ddb.h"
#include "opt_pax.h"
@@ -1905,7 +1905,8 @@ uvm_map_findspace(struct vm_map *map, va
* hint may not be aligned properly; we need round up or down it
* before proceeding further.
*/
- uvm_map_align_va(&hint, align, topdown);
+ if ((flags & UVM_FLAG_COLORMATCH) == 0)
+ uvm_map_align_va(&hint, align, topdown);
/*
* Look for the first possible address; if there's already
