Module Name: src
Committed By: rmind
Date: Wed Oct 21 23:13:53 UTC 2009
Modified Files:
src/sys/rump/librump/rumpkern: emul.c sleepq.c vm.c
Log Message:
Sync rump with kernel changes.
To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.104 src/sys/rump/librump/rumpkern/emul.c
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/librump/rumpkern/sleepq.c
cvs rdiff -u -r1.64 -r1.65 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/rump/librump/rumpkern/emul.c
diff -u src/sys/rump/librump/rumpkern/emul.c:1.103 src/sys/rump/librump/rumpkern/emul.c:1.104
--- src/sys/rump/librump/rumpkern/emul.c:1.103 Fri Oct 16 00:14:53 2009
+++ src/sys/rump/librump/rumpkern/emul.c Wed Oct 21 23:13:53 2009
@@ -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
Index: src/sys/rump/librump/rumpkern/sleepq.c
diff -u src/sys/rump/librump/rumpkern/sleepq.c:1.4 src/sys/rump/librump/rumpkern/sleepq.c:1.5
--- src/sys/rump/librump/rumpkern/sleepq.c:1.4 Fri Oct 16 02:13:54 2009
+++ src/sys/rump/librump/rumpkern/sleepq.c Wed Oct 21 23:13:53 2009
@@ -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;
}
/*
Index: src/sys/rump/librump/rumpkern/vm.c
diff -u src/sys/rump/librump/rumpkern/vm.c:1.64 src/sys/rump/librump/rumpkern/vm.c:1.65
--- src/sys/rump/librump/rumpkern/vm.c:1.64 Wed Oct 21 21:12:06 2009
+++ src/sys/rump/librump/rumpkern/vm.c Wed Oct 21 23:13:53 2009
@@ -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 */
-}
