Module Name: src
Committed By: cherry
Date: Fri Jun 7 12:43:52 UTC 2019
Modified Files:
src/sys/arch/xen/x86: xen_intr.c
Log Message:
Fix build for the XEN3_PVHVM kernel by conditoinally compiling
redundant functions x86_enable_intr()/x86_disable_intr()
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/xen/x86/xen_intr.c
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/x86/xen_intr.c
diff -u src/sys/arch/xen/x86/xen_intr.c:1.16 src/sys/arch/xen/x86/xen_intr.c:1.17
--- src/sys/arch/xen/x86/xen_intr.c:1.16 Thu May 9 17:09:51 2019
+++ src/sys/arch/xen/x86/xen_intr.c Fri Jun 7 12:43:52 2019
@@ -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 @@ xen_spllower(int nlevel)
}
+#if !defined(XENPVHVM)
void
x86_disable_intr(void)
{
@@ -117,6 +118,8 @@ x86_enable_intr(void)
hypervisor_force_callback();
}
+#endif /* !XENPVHVM */
+
u_long
xen_read_psl(void)
{
