[src/trunk]: src/sys/arch/xen/include This should return the amd64 build to a...

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

details:   https://anonhg.NetBSD.org/src/rev/711180126210
branches:  trunk
changeset: 348371:711180126210
user:      kre <kre%NetBSD.org@localhost>
date:      Sun Oct 16 06:40:43 2016 +0000

description:
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.

diffstat:

 sys/arch/xen/include/intr.h |  10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diffs (24 lines):

diff -r 600cea6fd828 -r 711180126210 sys/arch/xen/include/intr.h
--- a/sys/arch/xen/include/intr.h       Sun Oct 16 06:23:48 2016 +0000
+++ b/sys/arch/xen/include/intr.h       Sun Oct 16 06:40:43 2016 +0000
@@ -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 @@
 #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_ */