Module Name: src
Committed By: ad
Date: Sat Dec 21 16:10:20 UTC 2019
Modified Files:
src/sys/uvm: uvm_pdaemon.c
Log Message:
Fix merge error - don't init uvmpd_lock twice.
To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 src/sys/uvm/uvm_pdaemon.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_pdaemon.c
diff -u src/sys/uvm/uvm_pdaemon.c:1.117 src/sys/uvm/uvm_pdaemon.c:1.118
--- src/sys/uvm/uvm_pdaemon.c:1.117 Sat Dec 21 14:50:34 2019
+++ src/sys/uvm/uvm_pdaemon.c Sat Dec 21 16:10:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_pdaemon.c,v 1.117 2019/12/21 14:50:34 ad Exp $ */
+/* $NetBSD: uvm_pdaemon.c,v 1.118 2019/12/21 16:10:20 ad Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_pdaemon.c,v 1.117 2019/12/21 14:50:34 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_pdaemon.c,v 1.118 2019/12/21 16:10:20 ad Exp $");
#include "opt_uvmhist.h"
#include "opt_readahead.h"
@@ -247,7 +247,6 @@ uvm_pageout(void *arg)
UVMHIST_LOG(pdhist,"<starting uvm pagedaemon>", 0, 0, 0, 0);
mutex_init(&uvmpd_lock, MUTEX_DEFAULT, IPL_VM);
- mutex_init(&uvmpd_lock, MUTEX_DEFAULT, IPL_VM);
cv_init(&uvmpd_pool_drain_cv, "pooldrain");
/* Create the pool drainer kernel thread. */
