[src/trunk]: src/sys/arch/x86 reorder includes to pull __HAVE_PCI_MSI_MSIX pr...

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

details:   https://anonhg.NetBSD.org/src/rev/75573667bb37
branches:  trunk
changeset: 1012518:75573667bb37
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Sat Aug 01 12:36:35 2020 +0000

description:
reorder includes to pull __HAVE_PCI_MSI_MSIX properly via
<x86/pci_machdep_common.h>

diffstat:

 sys/arch/x86/pci/pci_intr_machdep.c |   9 +++++----
 sys/arch/x86/x86/mainbus.c          |  16 ++++++++--------
 2 files changed, 13 insertions(+), 12 deletions(-)

diffs (85 lines):

diff -r e19f98fd9ff3 -r 75573667bb37 sys/arch/x86/pci/pci_intr_machdep.c
--- a/sys/arch/x86/pci/pci_intr_machdep.c       Sat Aug 01 12:28:19 2020 +0000
+++ b/sys/arch/x86/pci/pci_intr_machdep.c       Sat Aug 01 12:36:35 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pci_intr_machdep.c,v 1.50 2019/06/17 06:38:29 msaitoh Exp $    */
+/*     $NetBSD: pci_intr_machdep.c,v 1.51 2020/08/01 12:36:35 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.50 2019/06/17 06:38:29 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_intr_machdep.c,v 1.51 2020/08/01 12:36:35 jdolecek Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -85,13 +85,14 @@
 #include <sys/intr.h>
 #include <sys/kmem.h>
 
-#include <dev/pci/pcivar.h>
-
 #include "ioapic.h"
 #include "eisa.h"
 #include "acpica.h"
 #include "opt_mpbios.h"
 #include "opt_acpi.h"
+#include "opt_pci.h"
+
+#include <dev/pci/pcivar.h>
 
 #include <machine/i82489reg.h>
 
diff -r e19f98fd9ff3 -r 75573667bb37 sys/arch/x86/x86/mainbus.c
--- a/sys/arch/x86/x86/mainbus.c        Sat Aug 01 12:28:19 2020 +0000
+++ b/sys/arch/x86/x86/mainbus.c        Sat Aug 01 12:36:35 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.4 2020/04/25 15:26:18 bouyer Exp $ */
+/* $NetBSD: mainbus.c,v 1.5 2020/08/01 12:36:35 jdolecek Exp $ */
 
 /*
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -28,15 +28,18 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.4 2020/04/25 15:26:18 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.5 2020/08/01 12:36:35 jdolecek Exp $");
+
+#include "opt_acpi.h"
+#include "opt_mpbios.h"
+#include "opt_pcifixup.h"
+#include "opt_pci.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/reboot.h>
 
-#include <dev/pci/pcivar.h>
-
 #include <machine/cpuvar.h>
 #include <machine/mpbiosvar.h>
 #include <machine/mpacpi.h>
@@ -48,10 +51,6 @@
 #include "acpica.h"
 #include "ipmi.h"
 
-#include "opt_acpi.h"
-#include "opt_mpbios.h"
-#include "opt_pcifixup.h"
-
 #if NACPICA > 0
 #include <dev/acpi/acpivar.h>
 #endif
@@ -63,6 +62,7 @@
 #endif
 
 #if NPCI > 0
+#include <dev/pci/pcivar.h>
 #if defined(PCI_BUS_FIXUP)
 #include <arch/x86/pci/pci_bus_fixup.h>
 #if defined(PCI_ADDR_FIXUP)