Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/x86/x86 Fix compile on !DIAGNOSTIC.



details:   https://anonhg.NetBSD.org/src/rev/24fc152c2147
branches:  trunk
changeset: 847424:24fc152c2147
user:      ad <ad%NetBSD.org@localhost>
date:      Sun Dec 22 16:50:03 2019 +0000

description:
Fix compile on !DIAGNOSTIC.

diffstat:

 sys/arch/x86/x86/intr.c |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (28 lines):

diff -r 1899a65171f3 -r 24fc152c2147 sys/arch/x86/x86/intr.c
--- a/sys/arch/x86/x86/intr.c   Sun Dec 22 16:44:35 2019 +0000
+++ b/sys/arch/x86/x86/intr.c   Sun Dec 22 16:50:03 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intr.c,v 1.148 2019/12/22 15:09:39 thorpej Exp $       */
+/*     $NetBSD: intr.c,v 1.149 2019/12/22 16:50:03 ad Exp $    */
 
 /*
  * Copyright (c) 2007, 2008, 2009, 2019 The NetBSD Foundation, Inc.
@@ -133,7 +133,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.148 2019/12/22 15:09:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.149 2019/12/22 16:50:03 ad Exp $");
 
 #include "opt_intrdebug.h"
 #include "opt_multiprocessor.h"
@@ -1102,8 +1102,7 @@
                 * We can't take the cpu_lock in this case, and we must
                 * therefore be extra careful.
                 */
-               struct cpu_info * const ci = ih->ih_cpu;
-               KASSERT(ci == curcpu() || !mp_online);
+               KASSERT(ih->ih_cpu == curcpu() || !mp_online);
                intr_mask_xcall(ih, (void *)(uintptr_t)true);
                return;
        }



Home | Main Index | Thread Index | Old Index