[src/netbsd-9]: src/sys/arch/x86/x86 Pull up following revision(s) (requested...

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

details:   https://anonhg.NetBSD.org/src/rev/8d3f8c7e5c60
branches:  netbsd-9
changeset: 466585:8d3f8c7e5c60
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Dec 29 09:33:43 2019 +0000

description:
Pull up following revision(s) (requested by pgoyette in ticket #587):

        sys/arch/x86/x86/x86_machdep.c: revision 1.134

to know this in order to set module_machine correctly, which in turn is
needed to set the module_base path from which modules are loaded and
which provides the value of sysctl(8) variable kern.module.path

Thanks to jnemeth@ for pointing out the problem.

diffstat:

 sys/arch/x86/x86/x86_machdep.c |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (25 lines):

diff -r 63ea464c3b74 -r 8d3f8c7e5c60 sys/arch/x86/x86/x86_machdep.c
--- a/sys/arch/x86/x86/x86_machdep.c    Sun Dec 29 09:27:09 2019 +0000
+++ b/sys/arch/x86/x86/x86_machdep.c    Sun Dec 29 09:33:43 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: x86_machdep.c,v 1.127 2019/05/29 16:54:41 maxv Exp $   */
+/*     $NetBSD: x86_machdep.c,v 1.127.2.1 2019/12/29 09:33:43 martin Exp $     */
 
 /*-
  * Copyright (c) 2002, 2006, 2007 YAMAMOTO Takashi,
@@ -31,13 +31,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.127 2019/05/29 16:54:41 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.127.2.1 2019/12/29 09:33:43 martin Exp $");
 
 #include "opt_modular.h"
 #include "opt_physmem.h"
 #include "opt_splash.h"
 #include "opt_kaslr.h"
 #include "opt_svs.h"
+#include "opt_xen.h"
 
 #include <sys/types.h>
 #include <sys/param.h>