4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Borislav Petkov <bp@xxxxxxx> (cherry picked from commit 55fa19d3e51f33d9cd4056d25836d93abf9438db) Make [ 0.031118] Spectre V2 mitigation: Mitigation: Full generic retpoline into [ 0.031118] Spectre V2: Mitigation: Full generic retpoline to reduce the mitigation mitigations strings. Signed-off-by: Borislav Petkov <bp@xxxxxxx> Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Reviewed-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> Cc: riel@xxxxxxxxxx Cc: ak@xxxxxxxxxxxxxxx Cc: peterz@xxxxxxxxxxxxx Cc: David Woodhouse <dwmw2@xxxxxxxxxxxxx> Cc: jikos@xxxxxxxxxx Cc: luto@xxxxxxxxxxxxxx Cc: dave.hansen@xxxxxxxxx Cc: torvalds@xxxxxxxxxxxxxxxxxxxx Cc: keescook@xxxxxxxxxx Cc: Josh Poimboeuf <jpoimboe@xxxxxxxxxx> Cc: tim.c.chen@xxxxxxxxxxxxxxx Cc: pjt@xxxxxxxxxx Link: https://lkml.kernel.org/r/20180126121139.31959-5-bp@xxxxxxxxx Signed-off-by: David Woodhouse <dwmw@xxxxxxxxxxxx> [jwang: port to 4.4] Signed-off-by: Jack Wang <jinpu.wang@xxxxxxxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- arch/x86/kernel/cpu/bugs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -90,7 +90,7 @@ static const char *spectre_v2_strings[] }; #undef pr_fmt -#define pr_fmt(fmt) "Spectre V2 mitigation: " fmt +#define pr_fmt(fmt) "Spectre V2 : " fmt static enum spectre_v2_mitigation spectre_v2_enabled = SPECTRE_V2_NONE;