Message ID | 20230605070124.3741859-16-mark.rutland@arm.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2499667vqr; Mon, 5 Jun 2023 00:08:26 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4uw+3AB9m64e6GHdDc45Fxy5pOWaMyH7zREqt3A3OKw7yZC7V4jWP4mM5edlljSA6vgpJD X-Received: by 2002:a05:6359:29:b0:127:f2f6:ef35 with SMTP id en41-20020a056359002900b00127f2f6ef35mr8962976rwb.3.1685948906381; Mon, 05 Jun 2023 00:08:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685948906; cv=none; d=google.com; s=arc-20160816; b=WSSSvHkhJBA51RogIGvpXi8ggRHC0fjNyHpF+SHQ+jEe4ruW70AevDz6lyJblikZRw RBj8fi/fnKy3k5IVCVFia4pq9QQihGzyq61F+8LjtevlEKPliNF76heinsbhHjNgfdla nSlZ6HxYXiOYOmD4GGrK+wRPpx0sYYqk+Ei6sHWiZaWY7qKSgsUbpE4KtOXef6osDNWA 9D/9SjymMXZZa4yu5HhT+XhKtNv2EFvFtRkwY8sHzR82B41fSTeJsQYQ22xpGSxi7qNB TvFCJjeyDE/RBbZ8GNt4i0xHhSflYGMp32PD3IM00Ov/TlxX8K+91CElm9BTWWSwd8GQ EfQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=DzG0Gmu2Wi7630BU3sryeUh3Cm6J0AGn3iOMiBvBoiQ=; b=FXHJsYpwunhUjZcVAvKkTcMNb3OxboA+TGoEjqeNr50r/tcO7IHeiR3xOJd8x2Sz6o UsU0kBXPTm3A7izCLAPWZ0j7PKZGqzM7rX4CTrS++qACRneJ6vDCawDfFXV++h7wR2vC vkBL/Z4fxLSTmVqEgGhxUjqFgyPystDzjB9yfh35pjDbRaLFULIy4SHqS1lMbeJmYkMH mhMl4mLVByaUPU4i/0jrAeO2hmGkBmi0KC5hPPSW/y6y7WIlYordnuWz1vKEMQ0B1IzH mmABgbAvOwfQ61fmgTMsLIvXCV0BZDdZlWkHsynlzTAHy70ELF5SF0TjAcTfw1ybO6L6 O48Q== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o8-20020a17090ac70800b0024ddf3f8a0bsi6803255pjt.82.2023.06.05.00.08.14; Mon, 05 Jun 2023 00:08:26 -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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230229AbjFEHDW (ORCPT <rfc822;pfffrao@gmail.com> + 99 others); Mon, 5 Jun 2023 03:03:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35760 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229649AbjFEHCo (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Mon, 5 Jun 2023 03:02:44 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 508D4F7; Mon, 5 Jun 2023 00:02:13 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 9A08F1655; Mon, 5 Jun 2023 00:02:56 -0700 (PDT) Received: from lakrids.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 4C21E3F793; Mon, 5 Jun 2023 00:02:09 -0700 (PDT) From: Mark Rutland <mark.rutland@arm.com> To: linux-kernel@vger.kernel.org Cc: akiyks@gmail.com, boqun.feng@gmail.com, corbet@lwn.net, keescook@chromium.org, linux@armlinux.org.uk, linux-doc@vger.kernel.org, mark.rutland@arm.com, mchehab@kernel.org, paulmck@kernel.org, peterz@infradead.org, rdunlap@infradead.org, sstabellini@kernel.org, will@kernel.org Subject: [PATCH v2 15/27] locking/atomic: scripts: remove leftover "${mult}" Date: Mon, 5 Jun 2023 08:01:12 +0100 Message-Id: <20230605070124.3741859-16-mark.rutland@arm.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230605070124.3741859-1-mark.rutland@arm.com> References: <20230605070124.3741859-1-mark.rutland@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE 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: <linux-kernel.vger.kernel.org> 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?1767845560336372403?= |
Series |
locking/atomic: restructuring + kerneldoc
|
|
Commit Message
Mark Rutland
June 5, 2023, 7:01 a.m. UTC
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 <mark.rutland@arm.com> Reviewed-by: Kees Cook <keescook@chromium.org> Cc: Boqun Feng <boqun.feng@gmail.com> Cc: Paul E. McKenney <paulmck@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Will Deacon <will@kernel.org> --- 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 a2ef735be8ca9..68557bfbbdc5e 100755 --- a/scripts/atomic/gen-atomic-instrumented.sh +++ b/scripts/atomic/gen-atomic-instrumented.sh @@ -118,7 +118,7 @@ cat <<EOF EOF [ -n "$kcsan_barrier" ] && printf "\t${kcsan_barrier}; \\\\\n" cat <<EOF - instrument_atomic_read_write(__ai_ptr, ${mult}sizeof(*__ai_ptr)); \\ + instrument_atomic_read_write(__ai_ptr, sizeof(*__ai_ptr)); \\ arch_${xchg}${order}(__ai_ptr, __VA_ARGS__); \\ }) EOF