From fb0fba91a57be9d9b36885282b136a5f825d8106 Mon Sep 17 00:00:00 2001 From: Leandro Pereira Date: Mon, 21 May 2018 17:36:40 -0700 Subject: [PATCH] arch: x86: Rename CPU_NO_SPECTRE to CPU_NO_SPECTRE_V2 There's a new known variant, so make it clear what this one is for. Signed-off-by: Leandro Pereira --- arch/x86/Kconfig | 2 +- kernel/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index b995cc1366e..9c202380485 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -90,7 +90,7 @@ config X86_NO_MELTDOWN This hidden option should be set on a per-SOC basis to indicate that a particular SOC is not vulnerable to the Meltdown CPU vulnerability. -config X86_NO_SPECTRE +config X86_NO_SPECTRE_V2 bool default y help diff --git a/kernel/Kconfig b/kernel/Kconfig index 18ff7af6e83..0a89922180c 100644 --- a/kernel/Kconfig +++ b/kernel/Kconfig @@ -556,7 +556,7 @@ menu "Security Options" config RETPOLINE bool prompt "Build with retpolines enabled" - default y if !X86_NO_SPECTRE + default y if !X86_NO_SPECTRE_V2 help This is recommended on platforms with speculative executions, to protect against branch target injection (AKA Spectre-V2). Full description of