diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-02-09 12:23:35 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-02-09 12:23:35 +0300 |
| commit | 93b894b6ab829fa640af041de36ced22c714c090 (patch) | |
| tree | 4907e8082828d3a7cdd241ab92d5769f22e344cf /arch/x86/xen/enlighten.c | |
| parent | d3aaf09f889b31f3b424bf9603b163ec1204c361 (diff) | |
| parent | 1b74dde7c47c19a73ea3e9fac95ac27b5d3d50c5 (diff) | |
| download | linux-93b894b6ab829fa640af041de36ced22c714c090.tar.xz | |
Merge branch 'x86/cpu' into perf/core, to pick up dependency
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/xen/enlighten.c')
| -rw-r--r-- | arch/x86/xen/enlighten.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index d09e4c9d7cc5..2c261082eadf 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -1654,7 +1654,7 @@ asmlinkage __visible void __init xen_start_kernel(void) 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[0] = cpuid_edx(1); + new_cpu_data.x86_capability[CPUID_1_EDX] = cpuid_edx(1); #endif if (xen_start_info->mod_start) { |