[src/trunk]: src/sys/uvm Fix previous; semantics of align argument of uvm_map...

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

details:   https://anonhg.NetBSD.org/src/rev/7e5d7d80d1b8
branches:  trunk
changeset: 966504:7e5d7d80d1b8
user:      rin <rin%NetBSD.org@localhost>
date:      Fri Nov 01 13:04:22 2019 +0000

description:
Fix previous; semantics of align argument of uvm_map() is different
when UVM_FLAG_COLORMATCH is specified.

Should fix PR kern/54669.

diffstat:

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

diffs (28 lines):

diff -r 77652f21618b -r 7e5d7d80d1b8 sys/uvm/uvm_map.c
--- a/sys/uvm/uvm_map.c Fri Nov 01 12:44:54 2019 +0000
+++ b/sys/uvm/uvm_map.c Fri Nov 01 13:04:22 2019 +0000
@@ -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 @@
         * 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