[src/trunk]: src/sys/arch Don't #include xen/intrdefs.h is !XEN.

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

details:   https://anonhg.NetBSD.org/src/rev/30ada6f73f7a
branches:  trunk
changeset: 971665:30ada6f73f7a
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Thu Apr 30 22:05:17 2020 +0000

description:
Don't #include xen/intrdefs.h is !XEN.
Should fix third-party module builds (e.g. virtualbox)

diffstat:

 sys/arch/amd64/include/intrdefs.h |  5 ++++-
 sys/arch/i386/include/intrdefs.h  |  5 ++++-
 sys/arch/x86/include/cpu.h        |  5 +++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diffs (43 lines):

diff -r c3813bc49046 -r 30ada6f73f7a sys/arch/amd64/include/intrdefs.h
--- a/sys/arch/amd64/include/intrdefs.h Thu Apr 30 20:54:27 2020 +0000
+++ b/sys/arch/amd64/include/intrdefs.h Thu Apr 30 22:05:17 2020 +0000
@@ -1,4 +1,7 @@
-/*     $NetBSD: intrdefs.h,v 1.3 2020/04/25 15:26:16 bouyer Exp $      */
+/*     $NetBSD: intrdefs.h,v 1.4 2020/04/30 22:05:17 bouyer Exp $      */
 
 #include <x86/intrdefs.h>
+
+#ifdef XEN
 #include <xen/intrdefs.h>
+#endif
diff -r c3813bc49046 -r 30ada6f73f7a sys/arch/i386/include/intrdefs.h
--- a/sys/arch/i386/include/intrdefs.h  Thu Apr 30 20:54:27 2020 +0000
+++ b/sys/arch/i386/include/intrdefs.h  Thu Apr 30 22:05:17 2020 +0000
@@ -1,4 +1,7 @@
-/*     $NetBSD: intrdefs.h,v 1.5 2020/04/25 15:26:17 bouyer Exp $      */
+/*     $NetBSD: intrdefs.h,v 1.6 2020/04/30 22:05:17 bouyer Exp $      */
 
 #include <x86/intrdefs.h>
+
+#ifdef XEN
 #include <xen/intrdefs.h>
+#endif
diff -r c3813bc49046 -r 30ada6f73f7a sys/arch/x86/include/cpu.h
--- a/sys/arch/x86/include/cpu.h        Thu Apr 30 20:54:27 2020 +0000
+++ b/sys/arch/x86/include/cpu.h        Thu Apr 30 22:05:17 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.123 2020/04/27 16:29:17 bouyer Exp $ */
+/*     $NetBSD: cpu.h,v 1.124 2020/04/30 22:05:17 bouyer Exp $ */
 
 /*
  * Copyright (c) 1990 The Regents of the University of California.
@@ -318,7 +318,8 @@
        struct evcnt    ci_xen_missed_hardclock_evcnt;
 #endif /* XEN */
 };
-#ifndef XENPV
+
+#if defined(XEN) && !defined(XENPV)
        __CTASSERT(XEN_NIPIS <= X86_NIPI);
 #endif