aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBoris Ostrovsky <boris.ostrovsky@oracle.com>2015-02-23 11:01:00 -0500
committerDavid Vrabel <david.vrabel@citrix.com>2015-02-23 16:30:26 +0000
commit5054daa285beaf706f051fbd395dc36c9f0f907f (patch)
tree94c1f076a07dbeb2a52bcb6b4aa23f7d584b5d6a
parentxen-scsiback: mark pvscsi frontend request consumed only after last read (diff)
downloadlinux-dev-5054daa285beaf706f051fbd395dc36c9f0f907f.tar.xz
linux-dev-5054daa285beaf706f051fbd395dc36c9f0f907f.zip
x86/xen: Initialize cr4 shadow for 64-bit PV(H) guests
Commit 1e02ce4cccdc ("x86: Store a per-cpu shadow copy of CR4") introduced CR4 shadows. These shadows are initialized in early boot code. The commit missed initialization for 64-bit PV(H) guests that this patch adds. Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com> Signed-off-by: David Vrabel <david.vrabel@citrix.com>
-rw-r--r--arch/x86/xen/enlighten.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index efee14db009b..5240f563076d 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -1758,6 +1758,7 @@ asmlinkage __visible void __init xen_start_kernel(void)
#ifdef CONFIG_X86_32
i386_start_kernel();
#else
+ cr4_init_shadow(); /* 32b kernel does this in i386_start_kernel() */
x86_64_start_reservations((char *)__pa_symbol(&boot_params));
#endif
}