Module Name: src
Committed By: ad
Date: Wed Jan 1 13:11:51 UTC 2020
Modified Files:
src/sys/uvm: uvm_amap.c
Log Message:
PR kern/54821: 9.99.32 assertion in uvm_pageactivate
Looks like I forgot to commit this file yesterday.
To generate a diff of this commit:
cvs rdiff -u -r1.111 -r1.112 src/sys/uvm/uvm_amap.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_amap.c
diff -u src/sys/uvm/uvm_amap.c:1.111 src/sys/uvm/uvm_amap.c:1.112
--- src/sys/uvm/uvm_amap.c:1.111 Fri Dec 13 20:10:22 2019
+++ src/sys/uvm/uvm_amap.c Wed Jan 1 13:11:51 2020
@@ -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 @@ ReStart:
* 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);
}
