From patchwork Fri Dec 16 22:16:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allen Webb X-Patchwork-Id: 34112 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp1227509wrn; Fri, 16 Dec 2022 14:21:17 -0800 (PST) X-Google-Smtp-Source: AMrXdXv/hEHKmB5ApGAKBxPWRRpaU4Iv2Img1HIBbBJCgP7Ff2gUcRSbGHlbA281L5AlPPuGPqNW X-Received: by 2002:a05:6402:cb1:b0:472:cf46:e4de with SMTP id cn17-20020a0564020cb100b00472cf46e4demr10056297edb.23.1671229277036; Fri, 16 Dec 2022 14:21:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671229277; cv=none; d=google.com; s=arc-20160816; b=R37ua5Y645tt3sFFbYKWW99iu7+fqZCvnN4XJsFTOnwVE+PCV+jj8iuV7H5abyyciP X/H4rk90dh4ho1EQLvtwnI6wkn5gWMyAzT97aoxj/XTj2Kw89/693HCwBnnXB/k2x+CF 8wYU6tP00qp4OvSeEyQVJVGyw0X7eKpWRBmL/GPLgTBhaDOJJla4QmYxT/aUSnGQeZLb 0+BhjV5SQJBsdKw/Uw+U5Fndwa20JOBSyximsH9ZH8/oEC/I1WfkJz6/xp8yaOT8SiZI 7tahCCWLyZIBAVqvJfsWIWKhdtALDMNFwk1yeAmygIARfga2jr071YQ5urtcbow/Cxxi WrWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:dkim-signature; bh=QIkoHfPVoGJGQCXWyZmF+mudK9y7JC4uGfB+VF9vmAA=; b=Fqy3cwYdmOKrNsRn2sIqUIf6iKqa5N0ECALQVVnCiuyTq9BrTqF3qslPuVMWoQ4/9x vbODj1XLuP+Kfa+A25k8MYGQocO+D+2RvL+Ifdsq3ICJnWK4uhQMBiKtIEwLSwbASgzv IusUz+dBr0DQ1CnZbIgxOMtaxFVE0qBpr70GFWEN5F3vXH51qtP4qNOJCUJ1L0w1hMR5 NIn+X6EPKVrucuDJiC6mr12ED3MmlyXRvTptko157Vro7nHS2OndEvQQHOwSPebLw2lF nLY1m/NUeUo0YFiSR16IZYQZo2W9VQw63q5p9fpfMqIK0x94j4IQhdl31qv01091sVIL 4RkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=DPM862br; 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=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c12-20020a05640227cc00b00459b51c2b25si4065863ede.438.2022.12.16.14.20.53; Fri, 16 Dec 2022 14:21:17 -0800 (PST) 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=@google.com header.s=20210112 header.b=DPM862br; 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=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229965AbiLPWR0 (ORCPT + 99 others); Fri, 16 Dec 2022 17:17:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49224 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229731AbiLPWRX (ORCPT ); Fri, 16 Dec 2022 17:17:23 -0500 Received: from mail-io1-xd4a.google.com (mail-io1-xd4a.google.com [IPv6:2607:f8b0:4864:20::d4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CF1DE2A252 for ; Fri, 16 Dec 2022 14:17:20 -0800 (PST) Received: by mail-io1-xd4a.google.com with SMTP id r25-20020a6bfc19000000b006e002cb217fso2026380ioh.2 for ; Fri, 16 Dec 2022 14:17:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=QIkoHfPVoGJGQCXWyZmF+mudK9y7JC4uGfB+VF9vmAA=; b=DPM862br1ksx4WgfZPPdueiIQnI6WvqPmGTG1MgLblwtuOlS7D2+IHQhAHJWXU9iNG j4RxkkFEM0HoFL3kqNsdC+IJMWBTwI8W6+Ta5PvZplSXceS8nTDmbx2x+33J5oD92OFT g77b5zdEyCeTgxNQQFcZA/XalLB+/1uF5YTqvBjiIxsFzKG/Km8FlFj84+FnuoT0LMow HT2aw6HDm83sOt0XTM+xnEBPzPFUkRx+tiHqOWVrRF/4zSEfTDSIW0wZe/YA3+3tJQA8 F7V6Z8l7ZANhHSadRJglbkKVcT0i88Xi5gRe00KnPx6R6+C1xOoBUsZ+idFieWINkCzf aXbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=QIkoHfPVoGJGQCXWyZmF+mudK9y7JC4uGfB+VF9vmAA=; b=swHBLyhoTTIPjGvzs6ZWTGUg4jQsdLEJ8yHU6S5ToXoArDdBDnCuOll6qfPDAfuNlF XZeZ5o8CYkHCzhDfKSo3zLj0iHSWZNUR+C9iHqj8riUMNJ2XjwaQkdmImnoLm2BR0EFQ aVFlAKpJaJqA9JFzvgm1gJyxDXmkeb01iisLIP/fuoi8D7G0qLUaOJ0dYpn7z7ZpAU5n WcGJDXPb64Omz9FaTOj2SKmO4cydWpY+U2ZbJ6SZCJJrz8nxfW/JCEY9+RWPfkVDZXbk cLxR7pDoGEURhbfCQXeIC1KqNuR19tiSBzg7Asi3ddfOpWSg6fTJ+nc8LQJCefEl1M8+ zjcg== X-Gm-Message-State: ANoB5pl1m5hBtTciKG/Syt5ltmKFAgYIzQ7Yl5mU3LlD39wIpCrvoyvp b3ptlqUmOyqtuJteXUZDlWhfqJSYCtaNUSs= X-Received: from allenwebb.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:12e8]) (user=allenwebb job=sendgmr) by 2002:a5d:9e4a:0:b0:6de:42ff:d96b with SMTP id i10-20020a5d9e4a000000b006de42ffd96bmr34882896ioi.58.1671229040270; Fri, 16 Dec 2022 14:17:20 -0800 (PST) Date: Fri, 16 Dec 2022 16:16:59 -0600 In-Reply-To: <20221216221703.294683-1-allenwebb@google.com> Mime-Version: 1.0 References: <20221216221703.294683-1-allenwebb@google.com> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog Message-ID: <20221216221703.294683-2-allenwebb@google.com> Subject: [PATCH v7 1/5] module.h: MODULE_DEVICE_TABLE for built-in modules From: Allen Webb To: "linux-modules@vger.kernel.org" , "linux-usb@vger.kernel.org" , "linux-kernel@vger.kernel.org" Cc: Luis Chamberlain , Greg Kroah-Hartman , "Rafael J. Wysocki" , Allen Webb X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=unavailable 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?1752410910230946689?= X-GMAIL-MSGID: =?utf-8?q?1752410910230946689?= Implement MODULE_DEVICE_TABLE for build-in modules to make it possible to generate a builtin.alias file to complement modules.alias. Signed-off-by: Allen Webb --- include/linux/module.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/include/linux/module.h b/include/linux/module.h index ec61fb53979a9..49e4019393127 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -243,7 +243,15 @@ extern void cleanup_module(void); extern typeof(name) __mod_##type##__##name##_device_table \ __attribute__ ((unused, alias(__stringify(name)))) #else /* !MODULE */ -#define MODULE_DEVICE_TABLE(type, name) +/* The names may not be unique for built-in modules, so include the module name + * to guarantee uniqueness. + */ +#define MODULE_DEVICE_TABLE(type, name) \ +extern void *CONCATENATE( \ + CONCATENATE(__mod_##type##__##name##__, \ + __KBUILD_MODNAME), \ + _device_table) \ + __attribute__ ((unused, alias(__stringify(name)))) #endif /* Version of form [:][-].