Module Name: src
Committed By: justin
Date: Sun Jun 29 11:36:52 UTC 2014
Modified Files:
src/sys/rump/librump/rumpkern: rump.c
Log Message:
Change assertion as rump_component_load may be called before curlwp available
To generate a diff of this commit:
cvs rdiff -u -r1.306 -r1.307 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.306 src/sys/rump/librump/rumpkern/rump.c:1.307
--- src/sys/rump/librump/rumpkern/rump.c:1.306 Fri Jun 13 15:45:02 2014
+++ src/sys/rump/librump/rumpkern/rump.c Sun Jun 29 11:36:52 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.c,v 1.306 2014/06/13 15:45:02 pooka Exp $ */
+/* $NetBSD: rump.c,v 1.307 2014/06/29 11:36:52 justin 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.306 2014/06/13 15:45:02 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.307 2014/06/29 11:36:52 justin Exp $");
#include <sys/systm.h>
#define ELFSIZE ARCH_ELFSIZE
@@ -531,7 +531,7 @@ rump_component_load(const struct rump_co
*/
rc = __UNCONST(rc_const);
- KASSERT(curlwp == bootlwp);
+ KASSERT(!rump_inited || curlwp == bootlwp);
LIST_FOREACH(rc_iter, &rchead, rc_entries) {
if (rc_iter == rc)
