[src/trunk]: src/sys/uvm PR kern/54821: 9.99.32 assertion in uvm_pageactivate

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

details:   https://anonhg.NetBSD.org/src/rev/a0256b5145a5
branches:  trunk
changeset: 466749:a0256b5145a5
user:      ad <ad%NetBSD.org@localhost>
date:      Wed Jan 01 13:11:51 2020 +0000

description:
PR kern/54821: 9.99.32 assertion in uvm_pageactivate

Looks like I forgot to commit this file yesterday.

diffstat:

 sys/uvm/uvm_amap.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (28 lines):

diff -r 96e0685c68c8 -r a0256b5145a5 sys/uvm/uvm_amap.c
--- a/sys/uvm/uvm_amap.c        Wed Jan 01 12:55:03 2020 +0000
+++ b/sys/uvm/uvm_amap.c        Wed Jan 01 13:11:51 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_amap.c,v 1.111 2019/12/13 20:10:22 ad Exp $        */
+/*     $NetBSD: uvm_amap.c,v 1.112 2020/01/01 13:11:51 ad Exp $        */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_amap.c,v 1.111 2019/12/13 20:10:22 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_amap.c,v 1.112 2020/01/01 13:11:51 ad Exp $");
 
 #include "opt_uvmhist.h"
 
@@ -1069,7 +1069,9 @@
                 * Drop PG_BUSY on new page.  Since its owner was locked all
                 * this time - it cannot be PG_RELEASED or PG_WANTED.
                 */
+               uvm_pagelock(npg);
                uvm_pageactivate(npg);
+               uvm_pageunlock(npg);
                npg->flags &= ~(PG_BUSY|PG_FAKE);
                UVM_PAGE_OWN(npg, NULL);
        }