[src/netbsd-9]: src/sys/uvm Addionally pull up the following revision for tic...

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

details:   https://anonhg.NetBSD.org/src/rev/547268d81958
branches:  netbsd-9
changeset: 462746:547268d81958
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Nov 01 18:24:31 2019 +0000

description:
Addionally pull up the following revision for ticket #388:

        sys/uvm/uvm_map.c                       1.366

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 bc2039513c6b -r 547268d81958 sys/uvm/uvm_map.c
--- a/sys/uvm/uvm_map.c Fri Nov 01 18:19:19 2019 +0000
+++ b/sys/uvm/uvm_map.c Fri Nov 01 18:24:31 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_map.c,v 1.362.2.1 2019/11/01 09:36:32 martin Exp $ */
+/*     $NetBSD: uvm_map.c,v 1.362.2.2 2019/11/01 18:24:31 martin 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.362.2.1 2019/11/01 09:36:32 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.362.2.2 2019/11/01 18:24:31 martin 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