Module Name: src
Committed By: pooka
Date: Tue Mar 11 20:32:05 UTC 2014
Modified Files:
src/sys/kern: subr_vmem.c
src/sys/rump/librump/rumpkern: vm.c
Log Message:
kill undesirable #ifndef _RUMPKERNEL
To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/sys/kern/subr_vmem.c
cvs rdiff -u -r1.151 -r1.152 src/sys/rump/librump/rumpkern/vm.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/kern/subr_vmem.c
diff -u src/sys/kern/subr_vmem.c:1.88 src/sys/kern/subr_vmem.c:1.89
--- src/sys/kern/subr_vmem.c:1.88 Mon Feb 17 20:40:06 2014
+++ src/sys/kern/subr_vmem.c Tue Mar 11 20:32:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_vmem.c,v 1.88 2014/02/17 20:40:06 para Exp $ */
+/* $NetBSD: subr_vmem.c,v 1.89 2014/03/11 20:32:05 pooka Exp $ */
/*-
* Copyright (c)2006,2007,2008,2009 YAMAMOTO Takashi,
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_vmem.c,v 1.88 2014/02/17 20:40:06 para Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_vmem.c,v 1.89 2014/03/11 20:32:05 pooka Exp $");
#if defined(_KERNEL)
#include "opt_ddb.h"
@@ -1176,7 +1176,7 @@ retry:
/* XXX */
if ((flags & VM_SLEEP) != 0) {
-#if defined(_KERNEL) && !defined(_RUMPKERNEL)
+#if defined(_KERNEL)
mutex_spin_enter(&uvm_fpageqlock);
uvm_kick_pdaemon();
mutex_spin_exit(&uvm_fpageqlock);
Index: src/sys/rump/librump/rumpkern/vm.c
diff -u src/sys/rump/librump/rumpkern/vm.c:1.151 src/sys/rump/librump/rumpkern/vm.c:1.152
--- src/sys/rump/librump/rumpkern/vm.c:1.151 Tue Mar 11 20:22:47 2014
+++ src/sys/rump/librump/rumpkern/vm.c Tue Mar 11 20:32:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: vm.c,v 1.151 2014/03/11 20:22:47 pooka Exp $ */
+/* $NetBSD: vm.c,v 1.152 2014/03/11 20:32:05 pooka Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.151 2014/03/11 20:22:47 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.152 2014/03/11 20:32:05 pooka Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -66,7 +66,8 @@ __KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.151
#include "rump_private.h"
#include "rump_vfs_private.h"
-kmutex_t uvm_pageqlock;
+kmutex_t uvm_pageqlock; /* non-free page lock */
+kmutex_t uvm_fpageqlock; /* free page lock, non-gpl license */
kmutex_t uvm_swap_data_lock;
struct uvmexp uvmexp;
@@ -344,6 +345,9 @@ uvm_init(void)
mutex_init(&uvm_pageqlock, MUTEX_DEFAULT, IPL_NONE);
mutex_init(&uvm_swap_data_lock, MUTEX_DEFAULT, IPL_NONE);
+ /* just to appease linkage */
+ mutex_init(&uvm_fpageqlock, MUTEX_SPIN, IPL_VM);
+
mutex_init(&pdaemonmtx, MUTEX_DEFAULT, IPL_NONE);
cv_init(&pdaemoncv, "pdaemon");
cv_init(&oomwait, "oomwait");
