Messages in this thread Patch in this message | | | Date | Sun, 15 Dec 2019 10:18:19 -0000 | From | "tip-bot2 for Borislav Petkov" <> | Subject | [tip: x86/cpu] x86/bugs: Move enum taa_mitigations to bugs.c |
| |
The following commit has been merged into the x86/cpu branch of tip:
Commit-ID: 72c2ce9867d9e8535f8c29eb6d842d1caad281af Gitweb: https://git.kernel.org/tip/72c2ce9867d9e8535f8c29eb6d842d1caad281af Author: Borislav Petkov <bp@suse.de> AuthorDate: Tue, 12 Nov 2019 21:58:57 +01:00 Committer: Borislav Petkov <bp@suse.de> CommitterDate: Sat, 14 Dec 2019 16:06:33 +01:00
x86/bugs: Move enum taa_mitigations to bugs.c
... because it is used only there.
No functional changes.
Signed-off-by: Borislav Petkov <bp@suse.de> Cc: x86@kernel.org Link: https://lkml.kernel.org/r/20191112221823.19677-1-bp@alien8.de --- arch/x86/include/asm/processor.h | 7 ------- arch/x86/kernel/cpu/bugs.c | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h index 0340aad..7c071f8 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h @@ -1015,11 +1015,4 @@ enum mds_mitigations { MDS_MITIGATION_VMWERV, }; -enum taa_mitigations { - TAA_MITIGATION_OFF, - TAA_MITIGATION_UCODE_NEEDED, - TAA_MITIGATION_VERW, - TAA_MITIGATION_TSX_DISABLED, -}; - #endif /* _ASM_X86_PROCESSOR_H */ diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index 8bf6489..ed54b3b 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -286,6 +286,13 @@ early_param("mds", mds_cmdline); #undef pr_fmt #define pr_fmt(fmt) "TAA: " fmt +enum taa_mitigations { + TAA_MITIGATION_OFF, + TAA_MITIGATION_UCODE_NEEDED, + TAA_MITIGATION_VERW, + TAA_MITIGATION_TSX_DISABLED, +}; + /* Default mitigation for TAA-affected CPUs */ static enum taa_mitigations taa_mitigation __ro_after_init = TAA_MITIGATION_VERW; static bool taa_nosmt __ro_after_init;
| |