The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=b55c0d5f56bde414b2c9842c23deaa30ab17e474
commit b55c0d5f56bde414b2c9842c23deaa30ab17e474 Author: Julien Grall <jul...@xen.org> AuthorDate: 2021-03-15 11:27:36 +0000 Commit: Roger Pau Monné <roy...@freebsd.org> CommitDate: 2021-03-15 13:20:21 +0000 xen: move x86-specific xen_vector_callback_enabled to sys/x86 This is x86-only and so should not be in the common area. Submitted by: Elliott Mitchell <ehem+free...@m5p.com> Reviewed by: royger Differential revision: https://reviews.freebsd.org/D29040 --- sys/x86/include/xen/xen-os.h | 3 +++ sys/xen/xen_intr.h | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/x86/include/xen/xen-os.h b/sys/x86/include/xen/xen-os.h index 115310520af0..86bacadc8521 100644 --- a/sys/x86/include/xen/xen-os.h +++ b/sys/x86/include/xen/xen-os.h @@ -33,6 +33,9 @@ /* Everything below this point is not included by assembler (.S) files. */ #ifndef __ASSEMBLY__ +/* If non-zero, the hypervisor has been configured to use a direct vector */ +extern int xen_vector_callback_enabled; + #endif /* !__ASSEMBLY__ */ #endif /* _MACHINE_X86_XEN_XEN_OS_H_ */ diff --git a/sys/xen/xen_intr.h b/sys/xen/xen_intr.h index 4aa4a9a8b8ea..74570267364d 100644 --- a/sys/xen/xen_intr.h +++ b/sys/xen/xen_intr.h @@ -38,9 +38,6 @@ /** Registered Xen interrupt callback handle. */ 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); /** _______________________________________________ dev-commits-src-main@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"