Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/i386/i386 build start_xenpvh only if XEN. Fixes NET...



details:   https://anonhg.NetBSD.org/src/rev/515398733021
branches:  trunk
changeset: 971815:515398733021
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Tue May 05 09:07:35 2020 +0000

description:
build start_xenpvh only if XEN. Fixes NET4501 build issue reported by
John D. Baker

diffstat:

 sys/arch/i386/i386/locore.S |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (38 lines):

diff -r e335c5cdcc1e -r 515398733021 sys/arch/i386/i386/locore.S
--- a/sys/arch/i386/i386/locore.S       Tue May 05 08:05:44 2020 +0000
+++ b/sys/arch/i386/i386/locore.S       Tue May 05 09:07:35 2020 +0000
@@ -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 @@
 #endif /* XENPV */
 END(start)
 
+#if defined(XEN)
 #ifndef XENPV
 /* entry point for Xen PVH */
 ENTRY(start_xenpvh)
@@ -1229,10 +1230,9 @@
        .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



Home | Main Index | Thread Index | Old Index