From patchwork Thu Aug 10 23:29:11 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: 134271 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp799527vqi; Thu, 10 Aug 2023 18:54:16 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFDBDnuHhdc2MA81+rgQDF83DuTetuP49I6r9sLNd8JrqkGJ/Ca6bvWOebwNEaQVy0d4yZc X-Received: by 2002:a05:6402:696:b0:522:3849:48d8 with SMTP id f22-20020a056402069600b00522384948d8mr541365edy.9.1691718856079; Thu, 10 Aug 2023 18:54:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691718856; cv=none; d=google.com; s=arc-20160816; b=jdvbrJQcYTIaurPAF/MJ6kREVRIRvegRh8SdKXE8zSvkuC3kMqIky+c4QWxUo9Z8Ud TFjWHbvhqDmRKn5FhGnzQhtF779h4ntpdmWCHCQR7Ysw+sUpDiVp8venb+IHrRacJymG FBxp5X36m4w3meJv2xH4sRD4eZ6IWm7QM0fQMuZye9fa5rB9QEL2mhaDuOeKkvXU9FEe x6FrOTuKUPEX8U3er97tHWWHZYz9qsae6ls6Uc9YsW0h10Yi60oMFFPx6vmJZ4RplasT p+5os6JJXhTsR40dYb4WbBKnogQBRPWCa6VWZcKG3gO78UT2HlM/FmUuacS/du22MkA+ OkSw== 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:cc:subject:to:reply-to:sender:from :dkim-signature:dkim-signature:date; bh=Qzz2rJbDMwtqi+XPUXa6GMdkxcSTLqzLBFlCQ0ojhsA=; fh=Gehs9fUUousxkPNHPgYGh0A81kyjBittH5nrwdmBypE=; b=CEUdzUX9JdhCW90ZvigU551cErCN+oFHt+h0wZjnHR7btBI1XQzteXGDAkTX3jhlgv PF2C/wpgdGJ+DtUE2W3whlBBiEpFCJaGZsfwd/s9BnOBO5EB+dNYa0VLIaE1pbs70Bxt h/EBAyGDpyVzGsjBTj4phyDisAX38lzeN7+V6XAJKVsk9c0TG0SidsddWmH70plY1rSj 11uU8iJfcWttcTCH5TqcZ8ig8jT2YKEsuZABWBYovX9fdVQdZBDLPjZJJ/+CIcoRYMis szrVjkjM9d4wqc01ZwNJl0+pcanKD7u0BpQL87xaN+plByITa5xum3wZ03wSyAhPzaT5 inbQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b="0Onl/r8S"; dkim=neutral (no key) header.i=@linutronix.de; 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 b18-20020aa7d492000000b00523228766fasi2535385edr.166.2023.08.10.18.53.52; Thu, 10 Aug 2023 18:54:16 -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="0Onl/r8S"; dkim=neutral (no key) header.i=@linutronix.de; 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 S232374AbjHJX3R (ORCPT + 99 others); Thu, 10 Aug 2023 19:29:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51848 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229504AbjHJX3O (ORCPT ); Thu, 10 Aug 2023 19:29:14 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 169C7270F; Thu, 10 Aug 2023 16:29:14 -0700 (PDT) Date: Thu, 10 Aug 2023 23:29:11 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1691710151; 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; bh=Qzz2rJbDMwtqi+XPUXa6GMdkxcSTLqzLBFlCQ0ojhsA=; b=0Onl/r8SDqIpcMTNPkT9+/pwvrtLztRR7og50ZMjCZ25rCk7jwdiRLKrY44wM4VroU9kwe 5o4OsK90/MnG43xk/6veRZDol3O1ZeNbu1KSpMv295D6rsS+led3c1aJFnPx55XYGBprOy yN9zS0w4qw1jndw4Xr1PNSjWWeuehImCM8E5KpTU67Vh3pVK1peVYDm8FtLxlcSDKtNP5Z hYkP9F8Ueliqn8emUqkpQfNppN4XguPctsP4YMvHcqpJWIVLSy10L1qck8kgicFo4MMTzq 5T8LMlPeVcd/PcZ8mwxI6EANVL8PXnOjn2wPbAVipboTawEDMkLcX8ZE8P7TSA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1691710151; 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; bh=Qzz2rJbDMwtqi+XPUXa6GMdkxcSTLqzLBFlCQ0ojhsA=; b=tW+T1rftDFNJLZHKnA7KJPwVvAdDwhKUNh5UKA51+hrA86j+783o+5MxV11JpGn3oTK4mq RQ+A/fRI/Ssi4QDA== From: "tip-bot2 for Arnd Bergmann" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/bugs] x86/speculation: Add cpu_show_gds() prototype Cc: Arnd Bergmann , Dave Hansen , Daniel Sneddon , stable@kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Message-ID: <169171015127.27769.17078494858704021692.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 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: 1773895791341083417 X-GMAIL-MSGID: 1773895791341083417 The following commit has been merged into the x86/bugs branch of tip: Commit-ID: a57c27c7ad85c420b7de44c6ee56692d51709dda Gitweb: https://git.kernel.org/tip/a57c27c7ad85c420b7de44c6ee56692d51709dda Author: Arnd Bergmann AuthorDate: Wed, 09 Aug 2023 15:04:59 +02:00 Committer: Dave Hansen CommitterDate: Thu, 10 Aug 2023 09:12:18 -07:00 x86/speculation: Add cpu_show_gds() prototype The newly added function has two definitions but no prototypes: drivers/base/cpu.c:605:16: error: no previous prototype for 'cpu_show_gds' [-Werror=missing-prototypes] Add a declaration next to the other ones for this file to avoid the warning. Fixes: 8974eb588283b ("x86/speculation: Add Gather Data Sampling mitigation") Signed-off-by: Arnd Bergmann Signed-off-by: Dave Hansen Tested-by: Daniel Sneddon Cc: stable@kernel.org Link: https://lore.kernel.org/all/20230809130530.1913368-1-arnd%40kernel.org --- include/linux/cpu.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/linux/cpu.h b/include/linux/cpu.h index 23ac87b..e006c71 100644 --- a/include/linux/cpu.h +++ b/include/linux/cpu.h @@ -72,6 +72,8 @@ extern ssize_t cpu_show_retbleed(struct device *dev, struct device_attribute *attr, char *buf); extern ssize_t cpu_show_spec_rstack_overflow(struct device *dev, struct device_attribute *attr, char *buf); +extern ssize_t cpu_show_gds(struct device *dev, + struct device_attribute *attr, char *buf); extern __printf(4, 5) struct device *cpu_device_create(struct device *parent, void *drvdata,