Module Name: src
Committed By: kre
Date: Sun Oct 16 06:40:44 UTC 2016
Modified Files:
src/sys/arch/xen/include: intr.h
Log Message:
This should return the amd64 build to a working state (and hopefully
i386 as well) - but this is a hideous hack, and should be reverted
as soon as a better (which means any) alternative is available.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/xen/include/intr.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/xen/include/intr.h
diff -u src/sys/arch/xen/include/intr.h:1.37 src/sys/arch/xen/include/intr.h:1.38
--- src/sys/arch/xen/include/intr.h:1.37 Thu Jul 7 06:55:40 2016
+++ src/sys/arch/xen/include/intr.h Sun Oct 16 06:40:43 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.37 2016/07/07 06:55:40 msaitoh Exp $ */
+/* $NetBSD: intr.h,v 1.38 2016/10/16 06:40:43 kre Exp $ */
/* NetBSD intr.h,v 1.15 2004/10/31 10:39:34 yamt Exp */
/*-
@@ -185,6 +185,14 @@ void xen_broadcast_ipi(uint32_t);
#define xen_broadcast_ipi(_i1) ((void) 0) /* nothing */
#endif /* MULTIPROCESSOR */
+/*
+ * XXX Hack: allow xen kernels to build with recent (Oct 2016) changes
+ * to acpi interrupt establishment (until a better solution)
+ */
+#define intr_establish_xname(a,b,c,d,e,f,g,h,i) intr_establish(a,b,c,d,e,f,g,h)
+#define isa_intr_establish_xname(a,b,c,d,e,f,g) isa_intr_establish(a,b,c,d,e,f)
+/* kcaH XXX */
+
#endif /* !_LOCORE */
#endif /* _XEN_INTR_H_ */
