[src/trunk]: src/sys/arch/x86/x86 i386 xen is pae

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

details:   https://anonhg.NetBSD.org/src/rev/1570bee09e3e
branches:  trunk
changeset: 433534:1570bee09e3e
user:      maxv <maxv%NetBSD.org@localhost>
date:      Wed Sep 19 16:23:05 2018 +0000

description:
i386 xen is pae

diffstat:

 sys/arch/x86/x86/x86_machdep.c |  13 ++++---------
 1 files changed, 4 insertions(+), 9 deletions(-)

diffs (43 lines):

diff -r 8475302b9ff4 -r 1570bee09e3e sys/arch/x86/x86/x86_machdep.c
--- a/sys/arch/x86/x86/x86_machdep.c    Wed Sep 19 16:11:53 2018 +0000
+++ b/sys/arch/x86/x86/x86_machdep.c    Wed Sep 19 16:23:05 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: x86_machdep.c,v 1.119 2018/07/13 09:37:32 maxv Exp $   */
+/*     $NetBSD: x86_machdep.c,v 1.120 2018/09/19 16:23:05 maxv Exp $   */
 
 /*-
  * Copyright (c) 2002, 2006, 2007 YAMAMOTO Takashi,
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.119 2018/07/13 09:37:32 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.120 2018/09/19 16:23:05 maxv Exp $");
 
 #include "opt_modular.h"
 #include "opt_physmem.h"
@@ -89,7 +89,6 @@
 
 #ifdef XEN
 char module_machine_amd64_xen[] = "amd64-xen";
-char module_machine_i386_xen[] = "i386-xen";
 char module_machine_i386pae_xen[] = "i386pae-xen";
 #endif
 
@@ -206,14 +205,10 @@
 
        /* setup module path for XEN kernels */
 #ifdef XEN
-#if defined(amd64)
+#ifdef __x86_64__
        module_machine = module_machine_amd64_xen;
-#elif defined(i386)
-#ifdef PAE
+#else
        module_machine = module_machine_i386pae_xen;
-#else
-       module_machine = module_machine_i386_xen;
-#endif
 #endif
 #endif