[src/trunk]: src/sys/rump/librump/rumpkern Sync rump with kernel changes.

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

details:   https://anonhg.NetBSD.org/src/rev/c2aef05d99ec
branches:  trunk
changeset: 748369:c2aef05d99ec
user:      rmind <rmind%NetBSD.org@localhost>
date:      Wed Oct 21 23:13:53 2009 +0000

description:
Sync rump with kernel changes.

diffstat:

 sys/rump/librump/rumpkern/emul.c   |   8 ++++----
 sys/rump/librump/rumpkern/sleepq.c |   8 +++-----
 sys/rump/librump/rumpkern/vm.c     |  11 ++---------
 3 files changed, 9 insertions(+), 18 deletions(-)

diffs (99 lines):

diff -r 4c70a03e78bc -r c2aef05d99ec sys/rump/librump/rumpkern/emul.c
--- a/sys/rump/librump/rumpkern/emul.c  Wed Oct 21 23:12:09 2009 +0000
+++ b/sys/rump/librump/rumpkern/emul.c  Wed Oct 21 23:13:53 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: emul.c,v 1.103 2009/10/16 00:14:53 pooka Exp $ */
+/*     $NetBSD: emul.c,v 1.104 2009/10/21 23:13:53 rmind Exp $ */
 
 /*
  * Copyright (c) 2007 Antti Kantee.  All Rights Reserved.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.103 2009/10/16 00:14:53 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.104 2009/10/21 23:13:53 rmind Exp $");
 
 #include <sys/param.h>
 #include <sys/malloc.h>
@@ -555,13 +555,13 @@
        /* we don't control scheduling currently, can't do anything now */
 }
 
-u_int
+void
 lwp_unsleep(lwp_t *l, bool cleanup)
 {
 
        KASSERT(mutex_owned(l->l_mutex));
 
-       return (*l->l_syncobj->sobj_unsleep)(l, cleanup);
+       (*l->l_syncobj->sobj_unsleep)(l, cleanup);
 }
 
 vaddr_t
diff -r 4c70a03e78bc -r c2aef05d99ec sys/rump/librump/rumpkern/sleepq.c
--- a/sys/rump/librump/rumpkern/sleepq.c        Wed Oct 21 23:12:09 2009 +0000
+++ b/sys/rump/librump/rumpkern/sleepq.c        Wed Oct 21 23:13:53 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sleepq.c,v 1.4 2009/10/16 02:13:54 pooka Exp $ */
+/*     $NetBSD: sleepq.c,v 1.5 2009/10/21 23:13:53 rmind Exp $ */
 
 /*
  * Copyright (c) 2008 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sleepq.c,v 1.4 2009/10/16 02:13:54 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sleepq.c,v 1.5 2009/10/21 23:13:53 rmind Exp $");
 
 #include <sys/param.h>
 #include <sys/condvar.h>
@@ -111,7 +111,7 @@
        return NULL;
 }
 
-u_int
+void
 sleepq_unsleep(struct lwp *l, bool cleanup)
 {
 
@@ -122,8 +122,6 @@
        if (cleanup) {
                mutex_spin_exit(l->l_mutex);
        }
-
-       return 0;
 }
 
 /*
diff -r 4c70a03e78bc -r c2aef05d99ec sys/rump/librump/rumpkern/vm.c
--- a/sys/rump/librump/rumpkern/vm.c    Wed Oct 21 23:12:09 2009 +0000
+++ b/sys/rump/librump/rumpkern/vm.c    Wed Oct 21 23:13:53 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vm.c,v 1.64 2009/10/21 21:12:06 rmind Exp $    */
+/*     $NetBSD: vm.c,v 1.65 2009/10/21 23:13:53 rmind Exp $    */
 
 /*
  * Copyright (c) 2007 Antti Kantee.  All Rights Reserved.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.64 2009/10/21 21:12:06 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.65 2009/10/21 23:13:53 rmind Exp $");
 
 #include <sys/param.h>
 #include <sys/atomic.h>
@@ -692,10 +692,3 @@
 
        /* nada */
 }
-
-void
-uvm_kick_scheduler(void)
-{
-
-       /* ouch */
-}