Received: by 10.223.185.116 with SMTP id b49csp1120163wrg; Fri, 23 Feb 2018 12:16:32 -0800 (PST) X-Google-Smtp-Source: AH8x227B3pQZWJDFBmREUXOCdOKXkMxd68DoRK+vZb/QQlfQabMoGrxHhD3dV3ijraExr3Ybb/bc X-Received: by 2002:a17:902:8d81:: with SMTP id v1-v6mr2751523plo.430.1519416992373; Fri, 23 Feb 2018 12:16:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519416992; cv=none; d=google.com; s=arc-20160816; b=lej5m0lxBzXka1Gbx31GgY9MyJ96C+MnqBG2QTqnTq9xeXfkNivtH98JawdRsxDhhq kh96Czvf1+b0ge2pDin4Fyp7lGbnMRwFsdN/LPROI5m7XwS8gGRVVXQq13XNkburgRwP K7XK+LlaM4k1usCPUHZPbPQ1SI/I+GwIiu66Mjv2zxfq70ASSg+Zj8irW6DPqLpOzFfz jCcLRjDwe84WLcsa+Idck1O86g7XiqHaOckGptOvcz5dOJIBS3IpFnLpHxde7YpMgx12 oJ85nXAuBw0EscP2LjpLP70aFKvHLXR6Lg19T4VS8cjb5PJDlZXkdvTHVn1b3wpIV63q PQZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=2DVtwH5tlQvATW3ziZUpm0I4vJ/v+x+ltVzG15MLh9U=; b=WlU7T66kww/5yU+QIomnZVBT2Dp4JnGALigXYqp6ywaiGaXSKeDm1EybiPINT2qgw9 NlqXBNqxLKpgNw3NHmN8Jq5rD7s+boysLb3WynOW5NKEFwdYnUjd2uOlp8m0T2lpN5O7 s+uXNV0THef25GkdgZKw8tIx5U9EGnnYKsQH8iXkYpc7s3W4jxQ+Pe7kig0HZRWVNdlG bM8ZOCHHaLs8Oho8pNyrlUo3AuCxDGXoNhbZcIQ0x/9i5MAdeVC4VaCitczA7HKrMW5N IHKBCiaRj/K32HL5T5X+3caBsAR4FSiKlCxZr7pBGcK0VOM+dsqT2dr6hFemuexIDf+y t7KA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h125si2307244pfc.133.2018.02.23.12.16.17; Fri, 23 Feb 2018 12:16:32 -0800 (PST) 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; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755220AbeBWUPo (ORCPT + 99 others); Fri, 23 Feb 2018 15:15:44 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:40164 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932658AbeBWSkj (ORCPT ); Fri, 23 Feb 2018 13:40:39 -0500 Received: from localhost (LFbn-1-12258-90.w90-92.abo.wanadoo.fr [90.92.71.90]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 00ED41214; Fri, 23 Feb 2018 18:40:39 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Borislav Petkov , Thomas Gleixner , riel@redhat.com, ak@linux.intel.com, peterz@infradead.org, David Woodhouse , jikos@kernel.org, luto@amacapital.net, dave.hansen@intel.com, torvalds@linux-foundation.org, keescook@google.com, Josh Poimboeuf , tim.c.chen@linux.intel.com, pjt@google.com, David Woodhouse , Jack Wang Subject: [PATCH 4.4 170/193] x86/bugs: Drop one "mitigation" from dmesg Date: Fri, 23 Feb 2018 19:26:43 +0100 Message-Id: <20180223170352.649818604@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180223170325.997716448@linuxfoundation.org> References: <20180223170325.997716448@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Borislav Petkov (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 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 Signed-off-by: David Woodhouse [jwang: port to 4.4] Signed-off-by: Jack Wang Signed-off-by: Greg Kroah-Hartman --- 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;