summaryrefslogtreecommitdiff
path: root/arch/x86/xen/enlighten.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2017-03-30 10:07:54 +0300
committerIngo Molnar <mingo@kernel.org>2017-03-30 10:07:54 +0300
commit73fa1362a7f337d149f76d26b6c6845cb38c1af9 (patch)
tree8b66c4e1995515b366f3bbe1f908d8c214c27e06 /arch/x86/xen/enlighten.c
parentfdd3d8ce0ea62c32b039af45cc5538b728e366d9 (diff)
parent6415813bae75feba10b8ca3ed6634a72c2a4d313 (diff)
downloadlinux-73fa1362a7f337d149f76d26b6c6845cb38c1af9.tar.xz
Merge branch 'x86/cpu' into x86/mm, before applying dependent patch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/xen/enlighten.c')
-rw-r--r--arch/x86/xen/enlighten.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 4951fcf95143..6efa0cc425a2 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -1595,7 +1595,6 @@ asmlinkage __visible void __init xen_start_kernel(void)
/* set up basic CPUID stuff */
cpu_detect(&new_cpu_data);
set_cpu_cap(&new_cpu_data, X86_FEATURE_FPU);
- new_cpu_data.wp_works_ok = 1;
new_cpu_data.x86_capability[CPUID_1_EDX] = cpuid_edx(1);
#endif