Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Fri, 26 Jan 2018 07:03:40 -0800
From:   tip-bot for Borislav Petkov <tipbot@zytor.com>
Message-ID: <tip-55fa19d3e51f33d9cd4056d25836d93abf9438db@git.kernel.org>
Cc:     dwmw2@infradead.org, linux-kernel@vger.kernel.org,
        jpoimboe@redhat.com, bp@suse.de, hpa@zytor.com,
        gregkh@linuxfoundation.org, tglx@linutronix.de, mingo@kernel.org
Reply-To: mingo@kernel.org, tglx@linutronix.de, gregkh@linuxfoundation.org,
          hpa@zytor.com, jpoimboe@redhat.com, bp@suse.de,
          dwmw2@infradead.org, linux-kernel@vger.kernel.org
In-Reply-To: <20180126121139.31959-5-bp@alien8.de>
References: <20180126121139.31959-5-bp@alien8.de>
To:     linux-tip-commits@vger.kernel.org
Subject: [tip:x86/pti] x86/bugs: Drop one "mitigation" from dmesg
Git-Commit-ID: 55fa19d3e51f33d9cd4056d25836d93abf9438db
Robot-ID: <tip-bot.git.kernel.org>
Robot-Unsubscribe: Contact <mailto:hpa@kernel.org> to get blacklisted from
 these emails
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset=UTF-8
Content-Disposition: inline
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Commit-ID:  55fa19d3e51f33d9cd4056d25836d93abf9438db
Gitweb:     https://git.kernel.org/tip/55fa19d3e51f33d9cd4056d25836d93abf9438db
Author:     Borislav Petkov <bp@suse.de>
AuthorDate: Fri, 26 Jan 2018 13:11:39 +0100
Committer:  Thomas Gleixner <tglx@linutronix.de>
CommitDate: Fri, 26 Jan 2018 15:53:19 +0100

x86/bugs: Drop one "mitigation" from dmesg

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

---
 arch/x86/kernel/cpu/bugs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index bac7a35..c988a8a 100644
--- 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;