From patchwork Sat Jun 10 09:13:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 105923 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1452082vqr; Sat, 10 Jun 2023 03:05:25 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6s6xuHIbdPrVpy2HIBkoJWLOysoC7tAHw0us5Cz9upT1K9fQ/lFnIKL7mqglvOd9+ghjEY X-Received: by 2002:a17:90b:19d0:b0:257:a8bf:b2ec with SMTP id nm16-20020a17090b19d000b00257a8bfb2ecmr3218985pjb.45.1686391525593; Sat, 10 Jun 2023 03:05:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686391525; cv=none; d=google.com; s=arc-20160816; b=cDm9tVbTd3sYOuolGyzmY0yUTFob3c9lMBdKCmYRW+4eyo8VLWmipZjGpUesVgrTiJ hngJig2grHv3kp1ANDrmgGag1rrwTieDMIQPQCNvQCU3ZPgpJVz4uK+xTpdN1V0Xw+vn 4bpAj/5G3w4E13WRNBulzisGryNOSmAGPUAyxTA9E1f9piweKJzbXf2uAcpZZd1Ta1Nt mpdFmWxI2DGD19qNQpur+ZFCjGVb+5gVziRJ2+cJb8JByz+qG0Sk3p1fMvtbyM+sA7eG zFWezMZ1fsWJZ13uF06ldJZlH23nKRDEhDVGpvKVA3pDoi8aAtozw9oAZ2AdnPiA6+UO tAUA== 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 :dkim-signature; bh=/bpbAd3aLXwvrOrBGiqk25IwulGrmkWI7Fkk4gpZSyo=; b=Eb1XgK5pHae0Ksx5tWcXzTfrnqDEKz3PaQJEZigOWGXxitHrTy6kmeooo3SyUXg47y R312JqQVpfpnEHNV2F4IXFZi4cnO9B1BE5DUSNyhWw4DkcdkDd/vZGXwbex3J0XlEkeW lkISu8VmZ8xWCSXG1sxPIdRQRZYmxP9bhR+50w2v2CMo2dCUhR9BePHoFx85XQK9yOO0 VY2YNnnaFuYDnklKOvzLVX1j5g8ddjOyrLqjEpehKO/hwC2M1hdsSqxDJpqHDBWClwyR NkDSinu8uQXzAdLKUXZy639k76OKXcm52S9XVT6PxQC0RxEXtRwwDsKMONs0NSQJupHX mLIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=k5AyddC6; 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=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c15-20020a170903234f00b001ab09a66f8dsi4065136plh.106.2023.06.10.03.05.13; Sat, 10 Jun 2023 03:05:25 -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=@kernel.org header.s=k20201202 header.b=k5AyddC6; 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=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234342AbjFJJPG (ORCPT + 99 others); Sat, 10 Jun 2023 05:15:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34234 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234667AbjFJJOW (ORCPT ); Sat, 10 Jun 2023 05:14:22 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C390A3AA8; Sat, 10 Jun 2023 02:14:05 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 3353F62062; Sat, 10 Jun 2023 09:14:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 48329C433EF; Sat, 10 Jun 2023 09:14:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1686388444; bh=xcoBBS4j2RIAWnyNGP0DVmJUBsQUOVbHeiB3BEvgdeI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k5AyddC6WuJ2wCTIZvBnbcNAvKQ008GAVGl9rorjCUXw9Mslqnt50+r6RzzE7rq4Q g0n5U82WFmlYSudoCvrhx99mRsHWbaIFy6SshHVyHZ+euh64J/Nj6qrDXxb7CIqx15 X0YlOH/uv10l9arls+EbM8wTnML3hStVenUMAOmbPztsR+zaR9RrYkuUBqiEybN5xL jRTEX9pjEjF6hXPh0EvWooDO5IIaWyj1hpFAKtOuM+3hVPyT7JyLJTimDYpZHLKiio 0hfl/OtpmdwMHVuDW6Gwe++oD4+UbUeDq9Z0m0/UAU+h/vvjKYmIl2vJjph7Inl5kx +l4dG9CQGI2bw== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Nathan Chancellor , Nick Desaulniers , Nicolas Schier , linux-um@lists.infradead.org, Masahiro Yamada Subject: [PATCH v8 11/11] linux/export.h: rename 'sec' argument to 'license' Date: Sat, 10 Jun 2023 18:13:20 +0900 Message-Id: <20230610091320.1054554-12-masahiroy@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230610091320.1054554-1-masahiroy@kernel.org> References: <20230610091320.1054554-1-masahiroy@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768309680573883476?= X-GMAIL-MSGID: =?utf-8?q?1768309680573883476?= Now, EXPORT_SYMBOL() is populated in two stages. In the first stage, all of EXPORT_SYMBOL/EXPORT_SYMBOL_GPL go into the same section, '.export_symbol'. 'sec' does not make sense any more. Rename it to 'license'. Signed-off-by: Masahiro Yamada Reviewed-by: Nick Desaulniers --- (no changes since v7) Changes in v7: - New patch include/linux/export.h | 8 ++++---- include/linux/pm.h | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/linux/export.h b/include/linux/export.h index 8a9b72386fff..427f5517217f 100644 --- a/include/linux/export.h +++ b/include/linux/export.h @@ -51,11 +51,11 @@ extern struct module __this_module; * be reused in other execution contexts such as the UEFI stub or the * decompressor. */ -#define __EXPORT_SYMBOL(sym, sec, ns) +#define __EXPORT_SYMBOL(sym, license, ns) #elif defined(__GENKSYMS__) -#define __EXPORT_SYMBOL(sym, sec, ns) __GENKSYMS_EXPORT_SYMBOL(sym) +#define __EXPORT_SYMBOL(sym, license, ns) __GENKSYMS_EXPORT_SYMBOL(sym) #elif defined(__ASSEMBLY__) @@ -72,9 +72,9 @@ extern struct module __this_module; #endif /* CONFIG_MODULES */ #ifdef DEFAULT_SYMBOL_NAMESPACE -#define _EXPORT_SYMBOL(sym, sec) __EXPORT_SYMBOL(sym, sec, __stringify(DEFAULT_SYMBOL_NAMESPACE)) +#define _EXPORT_SYMBOL(sym, license) __EXPORT_SYMBOL(sym, license, __stringify(DEFAULT_SYMBOL_NAMESPACE)) #else -#define _EXPORT_SYMBOL(sym, sec) __EXPORT_SYMBOL(sym, sec, "") +#define _EXPORT_SYMBOL(sym, license) __EXPORT_SYMBOL(sym, license, "") #endif #define EXPORT_SYMBOL(sym) _EXPORT_SYMBOL(sym,) diff --git a/include/linux/pm.h b/include/linux/pm.h index aabb6bd8f89e..1810d776e84a 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h @@ -375,14 +375,14 @@ const struct dev_pm_ops name = { \ } #ifdef CONFIG_PM -#define _EXPORT_DEV_PM_OPS(name, sec, ns) \ +#define _EXPORT_DEV_PM_OPS(name, license, ns) \ const struct dev_pm_ops name; \ - __EXPORT_SYMBOL(name, sec, ns); \ + __EXPORT_SYMBOL(name, license, ns); \ const struct dev_pm_ops name #define EXPORT_PM_FN_GPL(name) EXPORT_SYMBOL_GPL(name) #define EXPORT_PM_FN_NS_GPL(name, ns) EXPORT_SYMBOL_NS_GPL(name, ns) #else -#define _EXPORT_DEV_PM_OPS(name, sec, ns) \ +#define _EXPORT_DEV_PM_OPS(name, license, ns) \ static __maybe_unused const struct dev_pm_ops __static_##name #define EXPORT_PM_FN_GPL(name) #define EXPORT_PM_FN_NS_GPL(name, ns)