Skip to content

Commit de79182

Browse files
committed
x86/pti: Rename BUG_CPU_INSECURE to BUG_CPU_MELTDOWN
Use the name associated with the particular attack which needs page table isolation for mitigation. Signed-off-by: Thomas Gleixner <[email protected]> Acked-by: David Woodhouse <[email protected]> Cc: Alan Cox <[email protected]> Cc: Jiri Koshina <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Tim Chen <[email protected]> Cc: Andi Lutomirski <[email protected]> Cc: Andi Kleen <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Paul Turner <[email protected]> Cc: Tom Lendacky <[email protected]> Cc: Greg KH <[email protected]> Cc: Dave Hansen <[email protected]> Cc: Kees Cook <[email protected]> Cc: [email protected] Link: https://lkml.kernel.org/r/alpine.DEB.2.20.1801051525300.1724@nanos
1 parent b9e705e commit de79182

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

arch/x86/include/asm/cpufeatures.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,6 @@
341341
#define X86_BUG_SWAPGS_FENCE X86_BUG(11) /* SWAPGS without input dep on GS */
342342
#define X86_BUG_MONITOR X86_BUG(12) /* IPI required to wake up remote CPU */
343343
#define X86_BUG_AMD_E400 X86_BUG(13) /* CPU is among the affected by Erratum 400 */
344-
#define X86_BUG_CPU_INSECURE X86_BUG(14) /* CPU is insecure and needs kernel page table isolation */
344+
#define X86_BUG_CPU_MELTDOWN X86_BUG(14) /* CPU is affected by meltdown attack and needs kernel page table isolation */
345345

346346
#endif /* _ASM_X86_CPUFEATURES_H */

arch/x86/kernel/cpu/common.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -900,7 +900,7 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c)
900900
setup_force_cpu_cap(X86_FEATURE_ALWAYS);
901901

902902
if (c->x86_vendor != X86_VENDOR_AMD)
903-
setup_force_cpu_bug(X86_BUG_CPU_INSECURE);
903+
setup_force_cpu_bug(X86_BUG_CPU_MELTDOWN);
904904

905905
fpu__init_system(c);
906906

arch/x86/mm/pti.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@
5656

5757
static void __init pti_print_if_insecure(const char *reason)
5858
{
59-
if (boot_cpu_has_bug(X86_BUG_CPU_INSECURE))
59+
if (boot_cpu_has_bug(X86_BUG_CPU_MELTDOWN))
6060
pr_info("%s\n", reason);
6161
}
6262

6363
static void __init pti_print_if_secure(const char *reason)
6464
{
65-
if (!boot_cpu_has_bug(X86_BUG_CPU_INSECURE))
65+
if (!boot_cpu_has_bug(X86_BUG_CPU_MELTDOWN))
6666
pr_info("%s\n", reason);
6767
}
6868

@@ -96,7 +96,7 @@ void __init pti_check_boottime_disable(void)
9696
}
9797

9898
autosel:
99-
if (!boot_cpu_has_bug(X86_BUG_CPU_INSECURE))
99+
if (!boot_cpu_has_bug(X86_BUG_CPU_MELTDOWN))
100100
return;
101101
enable:
102102
setup_force_cpu_cap(X86_FEATURE_PTI);

0 commit comments

Comments
 (0)