[src/netbsd-6-0]: src/sys/kern Pull up following revision(s) (requested by rm...

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

details:   https://anonhg.NetBSD.org/src/rev/51faed5f14a9
branches:  netbsd-6-0
changeset: 774792:51faed5f14a9
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Sat Apr 20 10:05:44 2013 +0000

description:
Pull up following revision(s) (requested by rmind in ticket #868):
        sys/kern/subr_xcall.c: revision 1.15
xc_highpri: fix assert.

diffstat:

 sys/kern/subr_xcall.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 44ecd5eda259 -r 51faed5f14a9 sys/kern/subr_xcall.c
--- a/sys/kern/subr_xcall.c     Sat Apr 20 10:03:37 2013 +0000
+++ b/sys/kern/subr_xcall.c     Sat Apr 20 10:05:44 2013 +0000
@@ -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.16.1 2013/04/20 10:05:44 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.16.1 2013/04/20 10:05:44 bouyer Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -411,7 +411,7 @@
        }
        kpreempt_enable();
 #else
-       KASSERT(curcpu() == ci);
+       KASSERT(ci == NULL || curcpu() == ci);
        xc_ipi_handler();
 #endif