Module Name: src
Committed By: cherry
Date: Thu Dec 20 10:33:42 UTC 2018
Modified Files:
src/share/man/man4: options.4
src/sys/arch/x86/conf: files.x86
Log Message:
Enable 'options NO_PCI_MSI_MSIX' to DTRT in x86 builds.
Document 'options NO_PCI_MSI_MSIX' in options(4).
To generate a diff of this commit:
cvs rdiff -u -r1.495 -r1.496 src/share/man/man4/options.4
cvs rdiff -u -r1.104 -r1.105 src/sys/arch/x86/conf/files.x86
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man4/options.4
diff -u src/share/man/man4/options.4:1.495 src/share/man/man4/options.4:1.496
--- src/share/man/man4/options.4:1.495 Thu Dec 20 09:17:04 2018
+++ src/share/man/man4/options.4 Thu Dec 20 10:33:41 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: options.4,v 1.495 2018/12/20 09:17:04 cherry Exp $
+.\" $NetBSD: options.4,v 1.496 2018/12/20 10:33:41 cherry Exp $
.\"
.\" Copyright (c) 1996
.\" Perry E. Metzger. All rights reserved.
@@ -2688,6 +2688,11 @@ bolded
.El
.Ss x86-specific Options
.Bl -ohang
+.It Cd options NO_PCI_MSI_MSIX
+Disable support for MSI/MSIX in the kernel.
+See
+.Xr pci_msi 9
+for details of MSI/MSIX support
.It Cd options NO_PREEMPTION
Disables
.Xr kpreempt 9
Index: src/sys/arch/x86/conf/files.x86
diff -u src/sys/arch/x86/conf/files.x86:1.104 src/sys/arch/x86/conf/files.x86:1.105
--- src/sys/arch/x86/conf/files.x86:1.104 Fri Dec 7 15:47:11 2018
+++ src/sys/arch/x86/conf/files.x86 Thu Dec 20 10:33:41 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.x86,v 1.104 2018/12/07 15:47:11 maxv Exp $
+# $NetBSD: files.x86,v 1.105 2018/12/20 10:33:41 cherry Exp $
# options for MP configuration through the MP spec
defflag opt_mpbios.h MPBIOS MPDEBUG MPBIOS_SCANPCI
@@ -155,8 +155,8 @@ file arch/x86/x86/vga_post.c vga_post
file arch/x86/pci/pci_machdep.c pci
#file arch/x86/pci/pci_ranges.c pci
file arch/x86/pci/pci_intr_machdep.c pci
-file arch/x86/pci/pci_msi_machdep.c pci
-file arch/x86/pci/msipic.c pci
+file arch/x86/pci/pci_msi_machdep.c pci & ! no_pci_msi_msix
+file arch/x86/pci/msipic.c pci & ! no_pci_msi_msix
file arch/x86/pci/pciide_machdep.c pciide_common
