[src/trunk]: src/sys/arch/xen/x86 Fix build for the XEN3_PVHVM kernel by cond...

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

details:   https://anonhg.NetBSD.org/src/rev/b4fdafb80b5a
branches:  trunk
changeset: 451840:b4fdafb80b5a
user:      cherry <cherry%NetBSD.org@localhost>
date:      Fri Jun 07 12:43:52 2019 +0000

description:
Fix build for the XEN3_PVHVM kernel by conditoinally compiling
redundant functions x86_enable_intr()/x86_disable_intr()

diffstat:

 sys/arch/xen/x86/xen_intr.c |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (35 lines):

diff -r d54ace62a7e8 -r b4fdafb80b5a sys/arch/xen/x86/xen_intr.c
--- a/sys/arch/xen/x86/xen_intr.c       Fri Jun 07 12:11:43 2019 +0000
+++ b/sys/arch/xen/x86/xen_intr.c       Fri Jun 07 12:43:52 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xen_intr.c,v 1.16 2019/05/09 17:09:51 bouyer Exp $     */
+/*     $NetBSD: xen_intr.c,v 1.17 2019/06/07 12:43:52 cherry Exp $     */
 
 /*-
  * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xen_intr.c,v 1.16 2019/05/09 17:09:51 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xen_intr.c,v 1.17 2019/06/07 12:43:52 cherry Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -99,6 +99,7 @@
 }
 
 
+#if !defined(XENPVHVM)
 void
 x86_disable_intr(void)
 {
@@ -117,6 +118,8 @@
                hypervisor_force_callback();
 }
 
+#endif /* !XENPVHVM */
+
 u_long
 xen_read_psl(void)
 {