Module Name: src
Committed By: bouyer
Date: Thu Apr 30 22:05:18 UTC 2020
Modified Files:
src/sys/arch/amd64/include: intrdefs.h
src/sys/arch/i386/include: intrdefs.h
src/sys/arch/x86/include: cpu.h
Log Message:
Don't #include xen/intrdefs.h is !XEN.
Should fix third-party module builds (e.g. virtualbox)
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/amd64/include/intrdefs.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/i386/include/intrdefs.h
cvs rdiff -u -r1.123 -r1.124 src/sys/arch/x86/include/cpu.h
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/amd64/include/intrdefs.h
diff -u src/sys/arch/amd64/include/intrdefs.h:1.3 src/sys/arch/amd64/include/intrdefs.h:1.4
--- src/sys/arch/amd64/include/intrdefs.h:1.3 Sat Apr 25 15:26:16 2020
+++ src/sys/arch/amd64/include/intrdefs.h Thu Apr 30 22:05:17 2020
@@ -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
Index: src/sys/arch/i386/include/intrdefs.h
diff -u src/sys/arch/i386/include/intrdefs.h:1.5 src/sys/arch/i386/include/intrdefs.h:1.6
--- src/sys/arch/i386/include/intrdefs.h:1.5 Sat Apr 25 15:26:17 2020
+++ src/sys/arch/i386/include/intrdefs.h Thu Apr 30 22:05:17 2020
@@ -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
Index: src/sys/arch/x86/include/cpu.h
diff -u src/sys/arch/x86/include/cpu.h:1.123 src/sys/arch/x86/include/cpu.h:1.124
--- src/sys/arch/x86/include/cpu.h:1.123 Mon Apr 27 16:29:17 2020
+++ src/sys/arch/x86/include/cpu.h Thu Apr 30 22:05:17 2020
@@ -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 cpu_info {
struct evcnt ci_xen_missed_hardclock_evcnt;
#endif /* XEN */
};
-#ifndef XENPV
+
+#if defined(XEN) && !defined(XENPV)
__CTASSERT(XEN_NIPIS <= X86_NIPI);
#endif
