| From foo@baz Mon Feb 5 10:12:24 PST 2018 |
| Subject: x86/bugs: Drop one "mitigation" from dmesg |
| From: Borislav Petkov bp@suse.de |
| Date: Fri Jan 26 13:11:39 2018 +0100 |
| |
| From: Borislav Petkov bp@suse.de |
| |
| 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@suse.de> |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Cc: riel@redhat.com |
| Cc: ak@linux.intel.com |
| Cc: peterz@infradead.org |
| Cc: David Woodhouse <dwmw2@infradead.org> |
| Cc: jikos@kernel.org |
| Cc: luto@amacapital.net |
| Cc: dave.hansen@intel.com |
| Cc: torvalds@linux-foundation.org |
| Cc: keescook@google.com |
| Cc: Josh Poimboeuf <jpoimboe@redhat.com> |
| Cc: tim.c.chen@linux.intel.com |
| Cc: pjt@google.com |
| Link: https://lkml.kernel.org/r/20180126121139.31959-5-bp@alien8.de |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| |
| --- |
| 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 |
| @@ -91,7 +91,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; |
| static bool spectre_v2_bad_module; |
