[src/trunk]: src/sys/arch/x86/x86 Add KASSERT to confirm no change in xen int...

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

details:   https://anonhg.NetBSD.org/src/rev/99a09b24e6cc
branches:  trunk
changeset: 357459:99a09b24e6cc
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sat Nov 11 21:05:58 2017 +0000

description:
Add KASSERT to confirm no change in xen intr MP-safety annotations.

diffstat:

 sys/arch/x86/x86/intr.c |  11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diffs (32 lines):

diff -r 5eec0d6b9322 -r 99a09b24e6cc sys/arch/x86/x86/intr.c
--- a/sys/arch/x86/x86/intr.c   Sat Nov 11 21:03:01 2017 +0000
+++ b/sys/arch/x86/x86/intr.c   Sat Nov 11 21:05:58 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intr.c,v 1.111 2017/11/11 19:25:29 riastradh Exp $     */
+/*     $NetBSD: intr.c,v 1.112 2017/11/11 21:05:58 riastradh Exp $     */
 
 /*-
  * Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -133,7 +133,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.111 2017/11/11 19:25:29 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.112 2017/11/11 21:05:58 riastradh Exp $");
 
 #include "opt_intrdebug.h"
 #include "opt_multiprocessor.h"
@@ -1226,6 +1226,13 @@
        if (pic->pic_type == PIC_XEN) {
                struct intrhand *rih;
 
+               /*
+                * event_set_handler interprets `level != IPL_VM' to
+                * mean MP-safe, so we require the caller to match that
+                * for the moment.
+                */
+               KASSERT(known_mpsafe == (level != IPL_VM));
+
                event_set_handler(pin, handler, arg, level, xname);
 
                rih = kmem_zalloc(sizeof(*rih), cold ? KM_NOSLEEP : KM_SLEEP);