]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
x86/cpu: Probe CPUID leaf 6 even when cpuid_level == 6
authorAndy Lutomirski <luto@kernel.org>
Thu, 15 Dec 2016 18:14:42 +0000 (10:14 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 19 Jul 2018 13:35:57 +0000 (15:35 +0200)
commit654ee679e1a16eafc65c541f7dc71471b9608e04
tree7a5017a0093fbd17e9927d7b1815d0ff1a66f598
parent40ecc0aff22302ee76a724e7d3223ad8c75febe2
x86/cpu: Probe CPUID leaf 6 even when cpuid_level == 6

commit 3df8d9208569ef0b2313e516566222d745f3b94b upstream.

A typo (or mis-merge?) resulted in leaf 6 only being probed if
cpuid_level >= 7.

Fixes: 2ccd71f1b278 ("x86/cpufeature: Move some of the scattered feature bits to x86_capability")
Signed-off-by: Andy Lutomirski <luto@kernel.org>
Acked-by: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Link: http://lkml.kernel.org/r/6ea30c0e9daec21e488b54761881a6dfcf3e04d0.1481825597.git.luto@kernel.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Brad Spengler <spender@grsecurity.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/x86/kernel/cpu/common.c