From patchwork Fri Aug 11 18:39:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 134657 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp1307388vqi; Fri, 11 Aug 2023 12:24:47 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE1O0e+gwCpExbsaQ+ywZOkMO5nB2z5ttboThtfo29DBxWqhF6MCMjmKMh0ZfFXZEOCB8wP X-Received: by 2002:a05:6a00:1907:b0:668:753a:b150 with SMTP id y7-20020a056a00190700b00668753ab150mr2933133pfi.21.1691781887270; Fri, 11 Aug 2023 12:24:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691781887; cv=none; d=google.com; s=arc-20160816; b=q7Q7h7l3PM5ZZaYk/9uRCPOHXdh9MAqE2x/rBcCj+ZMN+D9Hh7MDtJkSA+vNmlRukJ Fk4HTjUKF5ku6QL507W5tR6Ox6MNVKzC3zcThlfqlr2zvTt1jitpfDLtgeKlvTQBd41j PbCKRQcL8yDksopqhJFFhebPjgIpbfgJ83o2IjYRTI+BwUvA/6yGUu5v0rdLdmG7o9es PVdi47fXULNwtgYGXFX2CDQR4JRafpkSBWnVV7tl3y4mh2suFMWA8A4HLoqR2cgeYRQt Ufx6RG3SmhcPtZxoXtdrXBwMQ3E7GLqdSl/MbKPDXrUY7nyGqgF3xGAH2VtSRwhQri2t kN3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=7U18nUB7ZZylyWZlfzeqQZ7OwuY9eqjEWthoA8dO794=; fh=9lZb8mpOQUX5k5wmSA9uVO++C8ofId1r53PY60v0Lag=; b=JgokQXvwg9ESKVjtRDb7mXMapvZPzr5wAbzp9zFPPDenjj6DBzGdpTIqjn1xovwDio 0I89LFPkTXZ6/vouHQoFw1ee+f6nPjgGcJe/nkOImTenS9l+6xSHvMmRnYJgRVS6YUdS 5a3HIlI0yMoqC5LlQyvPBGXbU3Jj/kySUnjXMqgKR8nl2X0DLasu/aGLDx7IDUTSbLY/ Pgs3hx4BKi8G2o+kbmgHe+gJgGMm6fRLR9MIacEv9ARZ1u+On5+8YklRW038BjvI6rIr YIXqJUhqfTjr2RK0UTpzfE4pxbL38Gg1CQD0MUJ6Z0YOTcU2TSL1IhhTatynhLbKXR/K 4FvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=kuMz1LxW; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=hGnA6Qua; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s36-20020a056a0017a400b0068035bb7a40si3931305pfg.366.2023.08.11.12.24.33; Fri, 11 Aug 2023 12:24:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=kuMz1LxW; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=hGnA6Qua; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235864AbjHKSjj (ORCPT + 99 others); Fri, 11 Aug 2023 14:39:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35116 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229549AbjHKSji (ORCPT ); Fri, 11 Aug 2023 14:39:38 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F044030DC; Fri, 11 Aug 2023 11:39:37 -0700 (PDT) Date: Fri, 11 Aug 2023 18:39:29 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1691779170; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7U18nUB7ZZylyWZlfzeqQZ7OwuY9eqjEWthoA8dO794=; b=kuMz1LxWWrX8QglIll+lhrYcE5rLf8TyWXJsKrXb9wk0PWYRIa32yypGMYJMbp6UqsapIC 9hkh6yM7tUpLp/mw+oj9dzv+qBf/qqMh7PmpYpctybGTIWRJISI2o+FWbHNt2O4X45WVyj jhZT0lwjzvitDJmnY0qwVdrrgrXhn/H6xlNLoWAq90Lxpb6e2a3BKQO7FMdQ7ItIfNwChI TAPHZv/d9RkXsTaVKRblzAMtFWtxXdgK/skP62mPbYUqswVJDmc+BZ/8MKD65HsMZX3o+g bCXJN6prJCr2thvKIXM02kp2CxtOCyJY9DAsgc1/l2TgVQKyb3utPLp5ZRByOg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1691779170; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7U18nUB7ZZylyWZlfzeqQZ7OwuY9eqjEWthoA8dO794=; b=hGnA6QuaWDDoX3Q742fNoz2hEX8ouxV6iT9tS3xgjeK0gWm9DFvM4ZDYn6ZaZeySnI2F8f Be5M5K9rOA0hDZAQ== From: "tip-bot2 for Borislav Petkov (AMD)" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/bugs] driver core: cpu: Fix the fallback cpu_show_gds() name Cc: "Borislav Petkov (AMD)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230811095831.27513-1-bp@alien8.de> References: <20230811095831.27513-1-bp@alien8.de> MIME-Version: 1.0 Message-ID: <169177916977.27769.3694730476189512700.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773927125306019868 X-GMAIL-MSGID: 1773961883983521815 The following commit has been merged into the x86/bugs branch of tip: Commit-ID: 3477144c878a52fc3938a529186e81ea030e7779 Gitweb: https://git.kernel.org/tip/3477144c878a52fc3938a529186e81ea030e7779 Author: Borislav Petkov (AMD) AuthorDate: Fri, 11 Aug 2023 11:32:09 +02:00 Committer: Borislav Petkov (AMD) CommitterDate: Fri, 11 Aug 2023 20:36:02 +02:00 driver core: cpu: Fix the fallback cpu_show_gds() name In 6524c798b727 ("driver core: cpu: Make cpu_show_not_affected() static") I fat-fingered the name of cpu_show_gds(). Usually, I'd rebase but since those are extraordinary embargoed times, the commit above was already pulled into another tree so no no. Therefore, fix it ontop. Fixes: 6524c798b727 ("driver core: cpu: Make cpu_show_not_affected() static") Signed-off-by: Borislav Petkov (AMD) Link: https://lore.kernel.org/r/20230811095831.27513-1-bp@alien8.de --- drivers/base/cpu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c index d7300d8..fe6690e 100644 --- a/drivers/base/cpu.c +++ b/drivers/base/cpu.c @@ -532,7 +532,7 @@ CPU_SHOW_VULN_FALLBACK(srbds); CPU_SHOW_VULN_FALLBACK(mmio_stale_data); CPU_SHOW_VULN_FALLBACK(retbleed); CPU_SHOW_VULN_FALLBACK(spec_rstack_overflow); -CPU_SHOW_VULN_FALLBACK(gather_data_sampling); +CPU_SHOW_VULN_FALLBACK(gds); static DEVICE_ATTR(meltdown, 0444, cpu_show_meltdown, NULL); static DEVICE_ATTR(spectre_v1, 0444, cpu_show_spectre_v1, NULL); @@ -546,7 +546,7 @@ static DEVICE_ATTR(srbds, 0444, cpu_show_srbds, NULL); static DEVICE_ATTR(mmio_stale_data, 0444, cpu_show_mmio_stale_data, NULL); static DEVICE_ATTR(retbleed, 0444, cpu_show_retbleed, NULL); static DEVICE_ATTR(spec_rstack_overflow, 0444, cpu_show_spec_rstack_overflow, NULL); -static DEVICE_ATTR(gather_data_sampling, 0444, cpu_show_gather_data_sampling, NULL); +static DEVICE_ATTR(gather_data_sampling, 0444, cpu_show_gds, NULL); static struct attribute *cpu_root_vulnerabilities_attrs[] = { &dev_attr_meltdown.attr,