From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x225WZ/ynA2c31fif2BZuDKZL80KOaCMwEbADwLL7uBbvIj+6n05EUpxKBt5xv6a9S0Br5fqT ARC-Seal: i=1; a=rsa-sha256; t=1516979220; cv=none; d=google.com; s=arc-20160816; b=YezPpXIvVV5z5HC/4O8115hETrEW1VSYv1YpjGflt9B47n+7gNqZenZAQp2jjUMRFn z5DgUoiU7LhzSCvLMggwKGjhp+E6O5AsT1JKFeEu17tfWEUflgItuQZBUhixtlnKJybD h4KjydsqINCsbP7UEW2lRYAz8Gr+mhxL/IdAIv3W1LVMs2bT4EYGRH3RFxM9og2NxHoc EqbbXebYkpSBJ4fR/bgUU7fAtlWKfMlqriF/wQzlJVPxKDhOh1yOHVS18wiYlCt8kFd6 8OIzKb0aEHF4S7xsuU7dvdscN/C4EMbNT2dx2n7I3Dqgc4AGkrlpzewsoQNTt8Pzwfln xqZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=precedence:content-disposition:content-transfer-encoding :mime-version:robot-unsubscribe:robot-id:git-commit-id:subject:to :references:in-reply-to:reply-to:cc:message-id:from:sender:date :arc-authentication-results; bh=5Hm9d7S+Tpx0erRJMSGbdLn+xWYtWLucOTFIjU0sK98=; b=R7HeC9E4sQhwxHY1QUUYXM8Vfvpx02JO6N9w3CxyPt8kr8hdLS1i58nR+dLEgX3RFy WbZAdd8nTfwoOij4L9gDlqIVQvZMnld8zuGzzL6Ppz1tnc9800ZHKp5kd0OC877ImRYP gS+Dh02xhkd2HLOxVU3DDUO8/GGAN7gTrpN+3CggDOraa/N/mwiwmdLE0LXyjYlpvDwx U+HqhinAOjgLdzaRNS3XWVYqYLDiFUwnZ7OvRSTdfruJTWoF8hnvULU3FAYj8o4YWgFk LL/GbINt5LaIHbq1dfJ872o6a5IugQRJasBp28PEtKYUDPOttTBuTxush8ruUKVnM9jw nqoA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of tipbot@zytor.com designates 65.50.211.136 as permitted sender) smtp.mailfrom=tipbot@zytor.com Authentication-Results: mx.google.com; spf=pass (google.com: domain of tipbot@zytor.com designates 65.50.211.136 as permitted sender) smtp.mailfrom=tipbot@zytor.com Date: Fri, 26 Jan 2018 07:03:40 -0800 Sender: tip tree robot From: tip-bot for Borislav Petkov Message-ID: 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 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1590656989875857401?= X-GMAIL-MSGID: =?utf-8?q?1590668003351180440?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: Commit-ID: 55fa19d3e51f33d9cd4056d25836d93abf9438db Gitweb: https://git.kernel.org/tip/55fa19d3e51f33d9cd4056d25836d93abf9438db Author: Borislav Petkov AuthorDate: Fri, 26 Jan 2018 13:11:39 +0100 Committer: Thomas Gleixner 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 Signed-off-by: Thomas Gleixner Reviewed-by: Greg Kroah-Hartman Cc: riel@redhat.com Cc: ak@linux.intel.com Cc: peterz@infradead.org Cc: David Woodhouse 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 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;