Module Name: src Committed By: knakahara Date: Tue Oct 6 09:44:31 UTC 2015
Modified Files: src/sys/arch/x86/x86: intr.c Log Message: quick hack for shared IRQ issue. To generate a diff of this commit: cvs rdiff -u -r1.87 -r1.88 src/sys/arch/x86/x86/intr.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/arch/x86/x86/intr.c diff -u src/sys/arch/x86/x86/intr.c:1.87 src/sys/arch/x86/x86/intr.c:1.88 --- src/sys/arch/x86/x86/intr.c:1.87 Mon Aug 17 06:16:03 2015 +++ src/sys/arch/x86/x86/intr.c Tue Oct 6 09:44:31 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: intr.c,v 1.87 2015/08/17 06:16:03 knakahara Exp $ */ +/* $NetBSD: intr.c,v 1.88 2015/10/06 09:44:31 knakahara 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.87 2015/08/17 06:16:03 knakahara Exp $"); +__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.88 2015/10/06 09:44:31 knakahara Exp $"); #include "opt_intrdebug.h" #include "opt_multiprocessor.h" @@ -1954,6 +1954,10 @@ intr_is_affinity_intrsource(struct intrs KASSERT(mutex_owned(&cpu_lock)); + /* XXX avoid shared IRQ issue. */ + if (isp->is_handlers == NULL) + return false; + ci = isp->is_handlers->ih_cpu; KASSERT(ci != NULL);