[src/trunk]: src/sys kill undesirable #ifndef _RUMPKERNEL

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/43212e774763
branches:  trunk
changeset: 327578:43212e774763
user:      pooka <pooka%NetBSD.org@localhost>
date:      Tue Mar 11 20:32:05 2014 +0000

description:
kill undesirable #ifndef _RUMPKERNEL

diffstat:

 sys/kern/subr_vmem.c           |   6 +++---
 sys/rump/librump/rumpkern/vm.c |  10 +++++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diffs (65 lines):

diff -r 6cc73e062e1c -r 43212e774763 sys/kern/subr_vmem.c
--- a/sys/kern/subr_vmem.c      Tue Mar 11 20:26:08 2014 +0000
+++ b/sys/kern/subr_vmem.c      Tue Mar 11 20:32:05 2014 +0000
@@ -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 @@
        /* 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);
diff -r 6cc73e062e1c -r 43212e774763 sys/rump/librump/rumpkern/vm.c
--- a/sys/rump/librump/rumpkern/vm.c    Tue Mar 11 20:26:08 2014 +0000
+++ b/sys/rump/librump/rumpkern/vm.c    Tue Mar 11 20:32:05 2014 +0000
@@ -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 @@
 #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 @@
        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");