]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
x86/speculation: Change misspelled STIPB to STIBP
authorWaiman Long <longman@redhat.com>
Wed, 5 Dec 2018 19:49:27 +0000 (14:49 -0500)
committerBorislav Petkov <bp@suse.de>
Thu, 6 Dec 2018 10:49:15 +0000 (11:49 +0100)
STIBP stands for Single Thread Indirect Branch Predictors. The acronym,
however, can be easily mis-spelled as STIPB. It is perhaps due to the
presence of another related term - IBPB (Indirect Branch Predictor
Barrier).

Fix the mis-spelling in the code.

Signed-off-by: Waiman Long <longman@redhat.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: David Woodhouse <dwmw@amazon.co.uk>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: KarimAllah Ahmed <karahmed@amazon.de>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tim Chen <tim.c.chen@linux.intel.com>
Cc: x86-ml <x86@kernel.org>
Link: https://lkml.kernel.org/r/1544039368-9009-1-git-send-email-longman@redhat.com
arch/x86/kernel/cpu/bugs.c
arch/x86/kernel/process.h

index 500278f5308ee2b1ccb7263e42861dbed76f44df..a68b32cb845a4478286144578e811de85844fba9 100644 (file)
@@ -54,7 +54,7 @@ static u64 __ro_after_init x86_spec_ctrl_mask = SPEC_CTRL_IBRS;
 u64 __ro_after_init x86_amd_ls_cfg_base;
 u64 __ro_after_init x86_amd_ls_cfg_ssbd_mask;
 
-/* Control conditional STIPB in switch_to() */
+/* Control conditional STIBP in switch_to() */
 DEFINE_STATIC_KEY_FALSE(switch_to_cond_stibp);
 /* Control conditional IBPB in switch_mm() */
 DEFINE_STATIC_KEY_FALSE(switch_mm_cond_ibpb);
@@ -379,12 +379,12 @@ spectre_v2_user_select_mitigation(enum spectre_v2_mitigation_cmd v2_cmd)
                        "always-on" : "conditional");
        }
 
-       /* If enhanced IBRS is enabled no STIPB required */
+       /* If enhanced IBRS is enabled no STIBP required */
        if (spectre_v2_enabled == SPECTRE_V2_IBRS_ENHANCED)
                return;
 
        /*
-        * If SMT is not possible or STIBP is not available clear the STIPB
+        * If SMT is not possible or STIBP is not available clear the STIBP
         * mode.
         */
        if (!smt_possible || !boot_cpu_has(X86_FEATURE_STIBP))
index 898e97cf6629d5d8569404a004eb08b31bc3ef96..320ab978fb1f3149b314beb8003c5b224490e7ca 100644 (file)
@@ -19,7 +19,7 @@ static inline void switch_to_extra(struct task_struct *prev,
        if (IS_ENABLED(CONFIG_SMP)) {
                /*
                 * Avoid __switch_to_xtra() invocation when conditional
-                * STIPB is disabled and the only different bit is
+                * STIBP is disabled and the only different bit is
                 * TIF_SPEC_IB. For CONFIG_SMP=n TIF_SPEC_IB is not
                 * in the TIF_WORK_CTXSW masks.
                 */