Module Name: src
Committed By: bouyer
Date: Sat Apr 20 10:05:23 UTC 2013
Modified Files:
src/sys/kern [netbsd-6]: subr_xcall.c
Log Message:
Pull up following revision(s) (requested by rmind in ticket #868):
sys/kern/subr_xcall.c: revision 1.15
xc_highpri: fix assert.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.10.1 src/sys/kern/subr_xcall.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/kern/subr_xcall.c
diff -u src/sys/kern/subr_xcall.c:1.13 src/sys/kern/subr_xcall.c:1.13.10.1
--- src/sys/kern/subr_xcall.c:1.13 Fri May 13 22:16:44 2011
+++ src/sys/kern/subr_xcall.c Sat Apr 20 10:05:22 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_xcall.c,v 1.13 2011/05/13 22:16:44 rmind Exp $ */
+/* $NetBSD: subr_xcall.c,v 1.13.10.1 2013/04/20 10:05:22 bouyer Exp $ */
/*-
* Copyright (c) 2007-2010 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_xcall.c,v 1.13 2011/05/13 22:16:44 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_xcall.c,v 1.13.10.1 2013/04/20 10:05:22 bouyer Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -411,7 +411,7 @@ xc_highpri(xcfunc_t func, void *arg1, vo
}
kpreempt_enable();
#else
- KASSERT(curcpu() == ci);
+ KASSERT(ci == NULL || curcpu() == ci);
xc_ipi_handler();
#endif
