From patchwork Tue Jun 6 08:26:20 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: 103650 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3245334vqr; Tue, 6 Jun 2023 01:54:09 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5w8J/algwMr2cBy2alkkDYtT++OWzG4iJ+JI+iAgydeOdBL3Xg5NhH7WseA29BbidyvApM X-Received: by 2002:ac8:570a:0:b0:3f7:ffc8:2f72 with SMTP id 10-20020ac8570a000000b003f7ffc82f72mr1253710qtw.58.1686041649529; Tue, 06 Jun 2023 01:54:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686041649; cv=none; d=google.com; s=arc-20160816; b=sXIxOhYMAx0GMwyEx1jibe9lkjaW8imcfprFvrcXF+g6HjHifvoPZxBt2WdNqnj8Lx Er7UGGkkVUFc3K6ERpY13kHrtZMk+LpKvabKqNMXxV7sQ8r6a6nacEJvbl6esb+qQlTc vF6VIqCL5egTBJq1O6Q4ERsKeQmOQLnI/x1fkMIAtZA3BGbFyrSjdFpF885jbxH2D0bg dlJt0Z/urR8pbdjSNtXd2kWjs7xMhFAVzKkfQQraKof5WGLkAx4R8z9G5K4S6jl/6YS2 rkV96uIT2JbJj+yzFozGtdmqVgSCmAmSyoU5TrO0kwsFUjIXRsjdnIaQPcL+lzBvlAIx bEHQ== 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=Fi8VwClKxFHmYf+7dhPTrzOI0O7eS4p0EvI4DS7OdGE=; b=Np7p16+SZXDonpwKp1HABLLEjqja06quWdLHUpMEhdCBP9hQmab3/gPrB0CU60CWUS Wsfu53eVM5fxvr2Zxu0U7hDm73whD81Lf0+oK6G9+l2XzUHML4K1KZDXzqIQ7cVsvijv Xqib8bFz5oEUmPnyZDICTRFOkSwHKFE0EKqrZKYpjvdn/ga0FKDypRUKKhaNWiJEFJTS voIcEStjYBaMVQKwhU4cvyGFk3+qGZuHEVFvHptKaotVeUVwRpdaRYVdoOLqk7guCfa1 Sd3pogh/c8F7x1Wu0Amcv/JV/UeKmWAJdtLsBIIFb9bpMjAWgjVqKw2fB+cQOkhxqm4Y hPrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=XCKhVcie; 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 t19-20020ac85893000000b003f53bb4c34fsi1852076qta.805.2023.06.06.01.53.55; Tue, 06 Jun 2023 01:54:09 -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=XCKhVcie; 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 S237031AbjFFI1J (ORCPT + 99 others); Tue, 6 Jun 2023 04:27:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53706 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236791AbjFFI0f (ORCPT ); Tue, 6 Jun 2023 04:26:35 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A47D71B8; Tue, 6 Jun 2023 01:26:24 -0700 (PDT) Date: Tue, 06 Jun 2023 08:26:20 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1686039980; 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=Fi8VwClKxFHmYf+7dhPTrzOI0O7eS4p0EvI4DS7OdGE=; b=XCKhVcieiLPcT8seg4Enj4aWuQS9tlHqu8+7aXmebyzp9jWqpqQBBfDDeosuAj4pMmvV8l uqk2lAr8Dq6ZZVWq7RvAvQWsLoLeGsp7lwxVwoYWn5akgl2Am7iiihrCyZnCN78XKYYAzP qwKt0F0JyjnBkRTgnkkWM+uYExXqlNQfBnxFXYsqva8TKNufMgqfRkdGf2HVd5mlw8pkZY /hvnPWsJB+cwDYzQ4sChQUlTV/Vlc+RfUV2NXGafKPBJNTN7bd6XdWlSihaFIwzJ41ILNm 3scsm9fQNS0MV31eax7Q/ufGSArI+xYivakWoUg5IHOJRknF/lifpBtbnzaupw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1686039980; 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=Fi8VwClKxFHmYf+7dhPTrzOI0O7eS4p0EvI4DS7OdGE=; b=QCrO6meeQQNPOLzXK2qODI5TcMzK/vtORldkh+Y5NkFbxPcz891F4c8hwh++nyKW2tKgLW RmUK9EJhYLX9XDAw== From: "tip-bot2 for Mark Rutland" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: locking/core] locking/atomic: scripts: remove leftover "${mult}" Cc: Mark Rutland , "Peter Zijlstra (Intel)" , Kees Cook , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230605070124.3741859-16-mark.rutland@arm.com> References: <20230605070124.3741859-16-mark.rutland@arm.com> MIME-Version: 1.0 Message-ID: <168603998038.404.16631419212140549148.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767845560336372403?= X-GMAIL-MSGID: =?utf-8?q?1767942808434509769?= The following commit has been merged into the locking/core branch of tip: Commit-ID: e40e5298e692bb6b5a200b3f0f55e6e5adf0e5ad Gitweb: https://git.kernel.org/tip/e40e5298e692bb6b5a200b3f0f55e6e5adf0e5ad Author: Mark Rutland AuthorDate: Mon, 05 Jun 2023 08:01:12 +01:00 Committer: Peter Zijlstra CommitterDate: Mon, 05 Jun 2023 09:57:18 +02:00 locking/atomic: scripts: remove leftover "${mult}" We removed cmpxchg_double() and variants in commit: b4cf83b2d1da40b2 ("arch: Remove cmpxchg_double") Which removed the need for "${mult}" in the instrumentation logic. Unfortunately we missed an instance of "${mult}". There is no change to the generated header. There should be no functional change as a result of this patch. Signed-off-by: Mark Rutland Signed-off-by: Peter Zijlstra (Intel) Reviewed-by: Kees Cook Link: https://lore.kernel.org/r/20230605070124.3741859-16-mark.rutland@arm.com --- scripts/atomic/gen-atomic-instrumented.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/atomic/gen-atomic-instrumented.sh b/scripts/atomic/gen-atomic-instrumented.sh index a2ef735..68557bf 100755 --- a/scripts/atomic/gen-atomic-instrumented.sh +++ b/scripts/atomic/gen-atomic-instrumented.sh @@ -118,7 +118,7 @@ cat <