Module Name: src
Committed By: jdolecek
Date: Tue Nov 27 21:03:50 UTC 2018
Modified Files:
src/sys/arch/x86/pci: pci_intr_machdep.c
Log Message:
actually allow pci_intr_alloc() with NULL count with MSI-X
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/x86/pci/pci_intr_machdep.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/pci/pci_intr_machdep.c
diff -u src/sys/arch/x86/pci/pci_intr_machdep.c:1.46 src/sys/arch/x86/pci/pci_intr_machdep.c:1.47
--- src/sys/arch/x86/pci/pci_intr_machdep.c:1.46 Tue Nov 27 20:08:05 2018
+++ src/sys/arch/x86/pci/pci_intr_machdep.c Tue Nov 27 21:03:50 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_intr_machdep.c,v 1.46 2018/11/27 20:08:05 jdolecek Exp $ */
+/* $NetBSD: pci_intr_machdep.c,v 1.47 2018/11/27 21:03:50 jdolecek Exp $ */
/*-
* Copyright (c) 1997, 1998, 2009 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_intr_machdep.c,v 1.46 2018/11/27 20:08:05 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_intr_machdep.c,v 1.47 2018/11/27 21:03:50 jdolecek Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -543,9 +543,8 @@ pci_intr_alloc(const struct pci_attach_a
if (msix_count > 0) {
error = pci_msix_alloc_exact(pa, ihps, msix_count);
if (error == 0) {
- KASSERTMSG(counts != NULL,
- "If MSI-X is used, counts must not be NULL.");
- counts[PCI_INTR_TYPE_MSIX] = msix_count;
+ if (counts != NULL)
+ counts[PCI_INTR_TYPE_MSIX] = msix_count;
goto out;
}
}
