diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-04-13 11:15:39 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-04-13 11:15:39 +0200 |
commit | cb44d0cfc2969999a4d9e20e4fd8749fec6c5498 (patch) | |
tree | 51fad115c6e18d0df352531baa1eb9bcb7aaa5e9 /arch/x86/kernel/cpu/amd.c | |
parent | 482dd2ef124484601adea82e5e806e81e2bc5521 (diff) | |
parent | d7847a7017b2a2759dd5590c0cffdbdf2994918e (diff) | |
download | lwn-cb44d0cfc2969999a4d9e20e4fd8749fec6c5498.tar.gz lwn-cb44d0cfc2969999a4d9e20e4fd8749fec6c5498.zip |
Merge branch 'x86/cpu' into x86/asm, to merge more patches
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/cpu/amd.c')
-rw-r--r-- | arch/x86/kernel/cpu/amd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index b7cc9efe08b5..02ac79b6256e 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -751,7 +751,7 @@ static void init_amd(struct cpuinfo_x86 *c) if (c->x86 >= 0xf) set_cpu_cap(c, X86_FEATURE_K8); - if (cpu_has_xmm2) { + if (cpu_has(c, X86_FEATURE_XMM2)) { /* MFENCE stops RDTSC speculation */ set_cpu_cap(c, X86_FEATURE_MFENCE_RDTSC); } |