Module Name: src
Committed By: jdolecek
Date: Sat Aug 1 12:39:40 UTC 2020
Modified Files:
src/sys/arch/xen/x86: pintr.c xen_intr.c
Log Message:
adjust includes to pull __HAVE_PCI_MSI_MSIX properly
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/xen/x86/pintr.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/xen/x86/xen_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/xen/x86/pintr.c
diff -u src/sys/arch/xen/x86/pintr.c:1.19 src/sys/arch/xen/x86/pintr.c:1.20
--- src/sys/arch/xen/x86/pintr.c:1.19 Sun Jul 19 16:20:36 2020
+++ src/sys/arch/xen/x86/pintr.c Sat Aug 1 12:39:40 2020
@@ -103,12 +103,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pintr.c,v 1.19 2020/07/19 16:20:36 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pintr.c,v 1.20 2020/08/01 12:39:40 jdolecek Exp $");
#include "opt_multiprocessor.h"
#include "opt_xen.h"
#include "isa.h"
#include "pci.h"
+#include "opt_pci.h"
#include <sys/param.h>
#include <sys/systm.h>
@@ -126,6 +127,8 @@ __KERNEL_RCSID(0, "$NetBSD: pintr.c,v 1.
#include <xen/evtchn.h>
#include <xen/intr.h>
+#include <dev/pci/pcivar.h>
+
#ifdef __HAVE_PCI_MSI_MSIX
#include <x86/pci/msipic.h>
#endif
Index: src/sys/arch/xen/x86/xen_intr.c
diff -u src/sys/arch/xen/x86/xen_intr.c:1.27 src/sys/arch/xen/x86/xen_intr.c:1.28
--- src/sys/arch/xen/x86/xen_intr.c:1.27 Thu May 7 19:48:58 2020
+++ src/sys/arch/xen/x86/xen_intr.c Sat Aug 1 12:39:40 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: xen_intr.c,v 1.27 2020/05/07 19:48:58 bouyer Exp $ */
+/* $NetBSD: xen_intr.c,v 1.28 2020/08/01 12:39:40 jdolecek Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -30,9 +30,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xen_intr.c,v 1.27 2020/05/07 19:48:58 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xen_intr.c,v 1.28 2020/08/01 12:39:40 jdolecek Exp $");
#include "opt_multiprocessor.h"
+#include "opt_pci.h"
#include <sys/param.h>
#include <sys/kernel.h>
