xen: Define xen_intr_handle_upcall in common headers

The function xen_intr_handle_upcall is used on every architecture supported
by Xen. It's pointless to define on every platform...

diff --git a/sys/dev/xen/xenpci/xenpci.c b/sys/dev/xen/xenpci/xenpci.c
index 3fdd78cf59671b0389df697189cf637073bf3c26..3a596b4a4f98ad5ac26ce8d324180966967f0782 100644 (file)
--- a/sys/dev/xen/xenpci/xenpci.c
+++ b/sys/dev/xen/xenpci/xenpci.c
@@ -43,14 +43,13 @@ __FBSDID("$FreeBSD$");
 #include <xen/features.h>
 #include <xen/hypervisor.h>
 #include <xen/hvm.h>
+#include <xen/xen_intr.h>
 
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 
 #include <dev/xen/xenpci/xenpcivar.h>
 
-extern void xen_intr_handle_upcall(struct trapframe *trap_frame);
-
 /*
  * This is used to find our platform device instance.
  */

diff --git a/sys/x86/include/apicvar.h b/sys/x86/include/apicvar.h
index 58fccede6cd0c555e80f43584776d7a5bc56ec39..4326cac3eade3f8f0ada7e3d419ee0273c348588 100644 (file)
--- a/sys/x86/include/apicvar.h
+++ b/sys/x86/include/apicvar.h
@@ -455,7 +455,6 @@ void        lapic_handle_cmc(void);
 void   lapic_handle_error(void);
 void   lapic_handle_intr(int vector, struct trapframe *frame);
 void   lapic_handle_timer(struct trapframe *frame);
-void   xen_intr_handle_upcall(struct trapframe *frame);
 void   hv_vector_handler(struct trapframe *frame);
 
 extern int x2apic_mode;

diff --git a/sys/xen/xen_intr.h b/sys/xen/xen_intr.h
index b86f94a43b999bffa6dc8de0bb225692249ef0c5..5b2f60804eac4b1ac3e2f8553ba10f82e3d9c9cf 100644 (file)
--- a/sys/xen/xen_intr.h
+++ b/sys/xen/xen_intr.h
@@ -41,6 +41,8 @@ typedef void * xen_intr_handle_t;
 /** If non-zero, the hypervisor has been configured to use a direct vector */
 extern int xen_vector_callback_enabled;
 
+void xen_intr_handle_upcall(struct trapframe *trap_frame);
+
 /**
  * Associate an already allocated local event channel port an interrupt
  * handler.