From patchwork Thu Jun 8 14:24:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 105005 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:3046:b0:115:7a1d:dabb with SMTP id p6csp394256rwl; Thu, 8 Jun 2023 08:05:47 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ71l11siA7RR8SdnS4SVTDRUpU+pSxnd669coPLpY9Lr8/twbeBfVMObVQESBpIFNxWAn6m X-Received: by 2002:a05:6a00:2d8e:b0:65b:a187:d433 with SMTP id fb14-20020a056a002d8e00b0065ba187d433mr9696852pfb.6.1686236747424; Thu, 08 Jun 2023 08:05:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686236747; cv=none; d=google.com; s=arc-20160816; b=H2Jbk5yyk3IFYLtbqhvTDBN3+n6dptY9toyuMV14/QWskBtaLYLaJe1CZ7S3BH6qW0 Acqv/fHQJO0KhYHFI+9NBfsj9+xHD3/ibysAWsg5GljScTvdQ0UgoUPvuRSgU8N6KZye UrbjxxbNKJc3uJlSdyyY6jzLySmGnr/d3/UIJOg5LQXtnlZbhFa7Idg+ZTMK2hO+WiMt DuATnpt4v180ClN/fZGW0yvqmyeQFRGkc+OzRQUMsX43ETJkIR6AzLM0KCraWsuE34no DC5+yaoK1cNiot4Yx/xz6zMQLOGLJ+QH0OlVd7DTVdlZcuk1EYFnY0IMU3RotiXQQAVh B2Tw== 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=WezBxe1rRPuSw67OVRYPRvBWfOVY/JEZduYcFRonXDs=; b=H824BAQbJXw5dVi9IVpoMBqUcXchbq/1ebTIW+B7ladGe2xSNCQvGGGiMtftKc6r5C 7r6qqDNEwQk3tcuL3odaGbg+OMoXbSEQa2bAB1eDw3pIAaOfviZzaHpGdAPnImz1jQnr xlIbZM+Jt63KlpMwtcyJmvlks0GyRKheqsP646fMm5fLndc6AeeJaT96U+ejKUw8PgPW 3yrJ7sTOyUQ3Y9vsFKpeivBzQyHOt5TS/lgYuwdJEizqylUNmMr/WArnayDIbsjiLNxk l8yb/f0xPmcLKKUPOAedn2gXaPaSKSRQpE+oKVjoQfW2cjlzolK0cRgHnZe0QW3CoNZL 7nTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ntFv6gYK; 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 a28-20020a63705c000000b005250c235984si1118998pgn.860.2023.06.08.08.05.27; Thu, 08 Jun 2023 08:05: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=@kernel.org header.s=k20201202 header.b=ntFv6gYK; 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 S237352AbjFHOZs (ORCPT + 99 others); Thu, 8 Jun 2023 10:25:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56324 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237112AbjFHOZT (ORCPT ); Thu, 8 Jun 2023 10:25:19 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 056112D59; Thu, 8 Jun 2023 07:25:00 -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 0E30B64E2A; Thu, 8 Jun 2023 14:24:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 32260C433D2; Thu, 8 Jun 2023 14:24:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1686234295; bh=W7P3iG4O3YjGApyRwNtiWKX5Kq+VmGX8uTvW8Ums99c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ntFv6gYKlgbdRwOlDg1ZciYIhnPhN2Yth0zSMBh1rlXZK4/QWKEvGYg1VqYJU7Q7Y 7kPowQgOC8uSdSuIVTPw8oBH0M1YSfJjTwNZPmE3GP7hQP++wMeo+yIOFshXSfOxWM kmEdw4koner4TpL3XNp9u65JUDy2+93IeydEtbqQ6qHjVK+wsFMWA8O6UX3h4NtYdx NHVPrlm87C9dMQoa0JsB8wSfS0xHgoDuGdYQKSt4dq7x2V5PMg5WMimbx42hWDuqHX ibVrSlp+cCQLo4yDl8Ecy3T+AR9+MhywHQsT3hKNrWQiJ0Gz/6hniiRPANFG6WcLxk Fh0DE3EZ2xB+Q== 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 v7 11/11] linux/export.h: rename 'sec' argument to 'license' Date: Thu, 8 Jun 2023 23:24:28 +0900 Message-Id: <20230608142428.256985-12-masahiroy@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230608142428.256985-1-masahiroy@kernel.org> References: <20230608142428.256985-1-masahiroy@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, 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?1768147383875079142?= X-GMAIL-MSGID: =?utf-8?q?1768147383875079142?= 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 --- 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 fed2e5717461..b411fdb88720 100644 --- a/include/linux/export.h +++ b/include/linux/export.h @@ -46,11 +46,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__) @@ -67,9 +67,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)