Module Name: src
Committed By: bouyer
Date: Tue May 5 09:07:35 UTC 2020
Modified Files:
src/sys/arch/i386/i386: locore.S
Log Message:
build start_xenpvh only if XEN. Fixes NET4501 build issue reported by
John D. Baker
To generate a diff of this commit:
cvs rdiff -u -r1.183 -r1.184 src/sys/arch/i386/i386/locore.S
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/i386/i386/locore.S
diff -u src/sys/arch/i386/i386/locore.S:1.183 src/sys/arch/i386/i386/locore.S:1.184
--- src/sys/arch/i386/i386/locore.S:1.183 Sat May 2 18:49:57 2020
+++ src/sys/arch/i386/i386/locore.S Tue May 5 09:07:35 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.183 2020/05/02 18:49:57 bouyer Exp $ */
+/* $NetBSD: locore.S,v 1.184 2020/05/05 09:07:35 bouyer Exp $ */
/*
* Copyright-o-rama!
@@ -128,7 +128,7 @@
*/
#include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.183 2020/05/02 18:49:57 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.184 2020/05/05 09:07:35 bouyer Exp $");
#include "opt_copy_symtab.h"
#include "opt_ddb.h"
@@ -1164,6 +1164,7 @@ begin:
#endif /* XENPV */
END(start)
+#if defined(XEN)
#ifndef XENPV
/* entry point for Xen PVH */
ENTRY(start_xenpvh)
@@ -1229,10 +1230,9 @@ gdt_xenpvh:
.long 0x00cf9200
gdt_xenpvhend:
.align 4
-#endif /* XENPV */
+#endif /* !XENPV */
-#if defined(XEN)
/* space for the hypercall call page */
#define HYPERCALL_PAGE_OFFSET 0x1000
.align HYPERCALL_PAGE_OFFSET
