Module Name: src
Committed By: pooka
Date: Mon Sep 9 19:18:08 UTC 2013
Modified Files:
src/sys/rump/librump/rumpkern: rump.c
Log Message:
Fix minor bug in previous: make sure we come out of rump_init()
without a bound lwp set.
To generate a diff of this commit:
cvs rdiff -u -r1.274 -r1.275 src/sys/rump/librump/rumpkern/rump.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/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.274 src/sys/rump/librump/rumpkern/rump.c:1.275
--- src/sys/rump/librump/rumpkern/rump.c:1.274 Sat Sep 7 17:58:00 2013
+++ src/sys/rump/librump/rumpkern/rump.c Mon Sep 9 19:18:08 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.c,v 1.274 2013/09/07 17:58:00 pooka Exp $ */
+/* $NetBSD: rump.c,v 1.275 2013/09/09 19:18:08 pooka Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.274 2013/09/07 17:58:00 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.275 2013/09/09 19:18:08 pooka Exp $");
#include <sys/systm.h>
#define ELFSIZE ARCH_ELFSIZE
@@ -546,8 +546,10 @@ rump_init(void)
bootlwp = NULL;
/* open 0/1/2 for init */
+ KASSERT(rump_lwproc_curlwp() == NULL);
rump_lwproc_switch(initlwp);
rump_consdev_init();
+ rump_lwproc_switch(NULL);
/* release cpu */
rump_unschedule();