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

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

details:   https://anonhg.NetBSD.org/src/rev/1892005ec37d
branches:  netbsd-7
changeset: 799535:1892005ec37d
user:      snj <snj%NetBSD.org@localhost>
date:      Tue Aug 04 18:12:28 2015 +0000

description:
Pull up following revision(s) (requested by prlw1 in ticket #934):
        sys/arch/xen/x86/cpu.c: revision 1.100
Move all pmap-related cpu_info initialisations, including
initializing ci_kpm_mtx, in cpu_attach_common() from cpu_init()
(ci_pmap and ci_tlbstate as already initialized in cpu_attach_common()).

diffstat:

 sys/arch/xen/x86/cpu.c |  19 +++++++++----------
 1 files changed, 9 insertions(+), 10 deletions(-)

diffs (47 lines):

diff -r 6cdb2d95a7aa -r 1892005ec37d sys/arch/xen/x86/cpu.c
--- a/sys/arch/xen/x86/cpu.c    Tue Aug 04 17:24:59 2015 +0000
+++ b/sys/arch/xen/x86/cpu.c    Tue Aug 04 18:12:28 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.c,v 1.98 2014/02/12 23:24:09 dsl Exp $     */
+/*     $NetBSD: cpu.c,v 1.98.4.1 2015/08/04 18:12:28 snj Exp $ */
 /* NetBSD: cpu.c,v 1.18 2004/02/20 17:35:01 yamt Exp  */
 
 /*-
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.98 2014/02/12 23:24:09 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.98.4.1 2015/08/04 18:12:28 snj Exp $");
 
 #include "opt_ddb.h"
 #include "opt_multiprocessor.h"
@@ -425,6 +425,13 @@
        }
 
        KASSERT(ci->ci_cpuid == ci->ci_index);
+#ifdef __x86_64__
+       /* No user PGD mapped for this CPU yet */
+       ci->ci_xen_current_user_pgd = 0;
+#endif
+#if defined(__x86_64__) || defined(PAE)
+       mutex_init(&ci->ci_kpm_mtx, MUTEX_DEFAULT, IPL_VM);
+#endif
        pmap_reference(pmap_kernel());
        ci->ci_pmap = pmap_kernel();
        ci->ci_tlbstate = TLBSTATE_STALE;
@@ -543,14 +550,6 @@
                        lcr4(rcr4() | CR4_OSXMMEXCPT);
        }
 
-#ifdef __x86_64__
-       /* No user PGD mapped for this CPU yet */
-       ci->ci_xen_current_user_pgd = 0;
-#endif
-#if defined(__x86_64__) || defined(PAE)
-       mutex_init(&ci->ci_kpm_mtx, MUTEX_DEFAULT, IPL_VM);
-#endif
-
        atomic_or_32(&ci->ci_flags, CPUF_RUNNING);
 }