]> www.infradead.org Git - users/jedix/linux-maple.git/commit
x86/cpufeatures: rename X86_FEATURE_AMD_SSBD to X86_FEATURE_LS_CFG_SSBD
authorMihai Carabas <mihai.carabas@oracle.com>
Wed, 7 Nov 2018 07:00:03 +0000 (09:00 +0200)
committerBrian Maly <brian.maly@oracle.com>
Tue, 5 Feb 2019 00:26:55 +0000 (19:26 -0500)
commita1a02e26cd913a7cfb5086b3f3cb1561c04447b6
tree613b5a660df84c1ecf04b82ba1693185a86b1a4c
parent4c93a749a155e5df867e0bcb0824f208ed9198cd
x86/cpufeatures: rename X86_FEATURE_AMD_SSBD to X86_FEATURE_LS_CFG_SSBD

The commit 52817587e706 ('x86/cpufeatures: Disentangle SSBD enumeration') from
upstream disentangles SSBD enumeration. We did not backport that commit because
we did not have what to disentangle on UEK4. Our cpufeature was already
synthetic.

That commit also renames X86_FEATURE_AMD_SSBD to X86_FEATURE_LS_CFG_SSBD. We
need this rename in order to not have conflicting cpu features while
backporting commit 6ac2f49edb1e ('x86/bugs: Add AMD's SPEC_CTRL MSR usage')
from upstream which introduces SPEC_CTRL MSR, which will be the prefered
method.

Orabug: 28870524
CVE: CVE-2018-3639

Signed-off-by: Mihai Carabas <mihai.carabas@oracle.com>
Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: Brian Maly <brian.maly@oracle.com>
arch/x86/include/asm/cpufeature.h
arch/x86/kernel/cpu/amd.c
arch/x86/kernel/cpu/bugs_64.c
arch/x86/kernel/process.c
arch/x86/kvm/cpuid.c