Module Name: src
Committed By: maxv
Date: Wed Sep 19 16:23:05 UTC 2018
Modified Files:
src/sys/arch/x86/x86: x86_machdep.c
Log Message:
i386 xen is pae
To generate a diff of this commit:
cvs rdiff -u -r1.119 -r1.120 src/sys/arch/x86/x86/x86_machdep.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/x86/x86/x86_machdep.c
diff -u src/sys/arch/x86/x86/x86_machdep.c:1.119 src/sys/arch/x86/x86/x86_machdep.c:1.120
--- src/sys/arch/x86/x86/x86_machdep.c:1.119 Fri Jul 13 09:37:32 2018
+++ src/sys/arch/x86/x86/x86_machdep.c Wed Sep 19 16:23:05 2018
@@ -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 @@ static char x86_cpu_idle_text[16];
#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 @@ module_init_md(void)
/* 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
- module_machine = module_machine_i386pae_xen;
#else
- module_machine = module_machine_i386_xen;
-#endif
+ module_machine = module_machine_i386pae_xen;
#endif
#endif
