Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/uvm Fix merge error - don't init uvmpd_lock twice.
details: https://anonhg.NetBSD.org/src/rev/de1b1658084c
branches: trunk
changeset: 1005806:de1b1658084c
user: ad <ad%NetBSD.org@localhost>
date: Sat Dec 21 16:10:20 2019 +0000
description:
Fix merge error - don't init uvmpd_lock twice.
diffstat:
sys/uvm/uvm_pdaemon.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diffs (26 lines):
diff -r 302e81026eed -r de1b1658084c sys/uvm/uvm_pdaemon.c
--- a/sys/uvm/uvm_pdaemon.c Sat Dec 21 16:00:29 2019 +0000
+++ b/sys/uvm/uvm_pdaemon.c Sat Dec 21 16:10:20 2019 +0000
@@ -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 @@
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. */
Home |
Main Index |
Thread Index |
Old Index