Module Name: src
Committed By: martin
Date: Fri Dec 27 06:58:56 UTC 2019
Modified Files:
src/sys/uvm [netbsd-9]: uvm_pager.c
Log Message:
Pull up following revision(s) (requested by ad in ticket #584):
sys/uvm/uvm_pager.c: revision 1.118
PR kern/48044: panic: kernel diagnostic assertion "uvmexp.swpgonly + npages <=
uvmexp.swpginuse" failed
swpgonly is updated asynchronously with regard to swap use. We can't assert
this condition with confidence in the post-5.0 world, at least not without
broader changes. swpgonly's ultimate use is of a heuristic nature so this
is no problem at all.
To generate a diff of this commit:
cvs rdiff -u -r1.111 -r1.111.8.1 src/sys/uvm/uvm_pager.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_pager.c
diff -u src/sys/uvm/uvm_pager.c:1.111 src/sys/uvm/uvm_pager.c:1.111.8.1
--- src/sys/uvm/uvm_pager.c:1.111 Sat Oct 28 00:37:13 2017
+++ src/sys/uvm/uvm_pager.c Fri Dec 27 06:58:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_pager.c,v 1.111 2017/10/28 00:37:13 pgoyette Exp $ */
+/* $NetBSD: uvm_pager.c,v 1.111.8.1 2019/12/27 06:58:56 martin Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_pager.c,v 1.111 2017/10/28 00:37:13 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_pager.c,v 1.111.8.1 2019/12/27 06:58:56 martin Exp $");
#include "opt_uvmhist.h"
#include "opt_readahead.h"
@@ -469,7 +469,6 @@ uvm_aio_aiodone_pages(struct vm_page **p
/* these pages are now only in swap. */
mutex_enter(&uvm_swap_data_lock);
if (error != ENOMEM) {
- KASSERT(uvmexp.swpgonly + npages <= uvmexp.swpginuse);
uvmexp.swpgonly += npages;
}
mutex_exit(&uvm_swap_data_lock);
