diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-03-30 09:07:54 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-03-30 09:07:54 +0200 |
| commit | 73fa1362a7f337d149f76d26b6c6845cb38c1af9 (patch) | |
| tree | 8b66c4e1995515b366f3bbe1f908d8c214c27e06 /arch/x86/xen | |
| parent | fdd3d8ce0ea62c32b039af45cc5538b728e366d9 (diff) | |
| parent | 6415813bae75feba10b8ca3ed6634a72c2a4d313 (diff) | |
| download | linux-stable-73fa1362a7f337d149f76d26b6c6845cb38c1af9.tar.gz linux-stable-73fa1362a7f337d149f76d26b6c6845cb38c1af9.tar.bz2 linux-stable-73fa1362a7f337d149f76d26b6c6845cb38c1af9.zip | |
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')
| -rw-r--r-- | arch/x86/xen/enlighten.c | 1 |
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 |