From patchwork Sat Jul 29 09:09:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benno Lossin X-Patchwork-Id: 128081 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp939186vqg; Sat, 29 Jul 2023 02:44:19 -0700 (PDT) X-Google-Smtp-Source: APBJJlH4UHxh3gI9N/7cfg+bBUKwCbEQjAVzN03gfw+I1lSFGuY9W3lTim9gltGWZP8Ol5I2Rt5P X-Received: by 2002:a17:902:a40d:b0:1bb:20ee:e29e with SMTP id p13-20020a170902a40d00b001bb20eee29emr3932450plq.1.1690623859257; Sat, 29 Jul 2023 02:44:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690623859; cv=none; d=google.com; s=arc-20160816; b=hOUkrhLAXEzn5rXwb2r/OZzeaUL/LG6CSK5ymDu9bWSxhqMQ3J4lHZdaQz2WJ+Ex/x 2rTipggEg1E31BlyIPTiQ4vGXltk0MvHQ1jAuq+fl5wOAF6b236UqNo0sYEF2lkcXv8N If/2J0Cif3cQ7HOngJyrb2PpqHb3q0GfNzveK4Iev6ghZ8AG5IHZIG2SIuoUJ1tzeGPg AqATGfLzaA8yVzBNOfVN9TKeawOU3GbTvCD+Z4DnuQ12Yp5YtWndsNAPFF4LVHBCFYxn 7N95QzTa9scpOsnfFI/8hJ72cltfhrHdRHvgcivZB4DXyfplIl55JS9dAjDQf2c4viGV Gmdg== 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 :feedback-id:references:in-reply-to:message-id:subject:cc:from:to :dkim-signature:date; bh=uCozY+Pcnawd0I1oW4pKqllFOri6l5nBR5qs/jiAoEo=; fh=qm1bOEYzVYZKL4fg86TgWb8D+QJA9mGpUhKFp2A6Xio=; b=kIf+u51cSppYjpSjJSoXEBoG6YjtScb2PlNHPbcnut/0C9Nkhnz9+DeIwT9KFcXqDJ CrkWVXZfAwZWOb2VtjjSdJRQbsW+pAzHk958DL0crTP1QZbeFDNlNUcL2q20hKYHPsUZ 6Ttbp8uLfE+IMf66i78naLykSTkbWWp5vzpdosFNJW2hcbdep+aKI+hpMeLUbEm/n+T6 dxwktEOVdREODPrs4Xk0suWsMvirNNmJBjwDlOAiEG5vjGr+PIcJ1GySFWCNLR+Q64sf ocf+9SAsmw/3nEx55ST4ARLW1QvM6PHRo9aKgjA3kSbykPk/S/r57JQ2xRAg7CK9zK97 q0wQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@proton.me header.s=protonmail header.b=lKDPxnyF; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=proton.me Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o5-20020a170902d4c500b001b7f4696a2csi4552615plg.347.2023.07.29.02.44.04; Sat, 29 Jul 2023 02:44:19 -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=@proton.me header.s=protonmail header.b=lKDPxnyF; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=proton.me Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231573AbjG2JKD (ORCPT + 99 others); Sat, 29 Jul 2023 05:10:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40538 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231547AbjG2JJu (ORCPT ); Sat, 29 Jul 2023 05:09:50 -0400 Received: from mail-40131.protonmail.ch (mail-40131.protonmail.ch [185.70.40.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 738A849EA for ; Sat, 29 Jul 2023 02:09:39 -0700 (PDT) Date: Sat, 29 Jul 2023 09:09:23 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1690621777; x=1690880977; bh=uCozY+Pcnawd0I1oW4pKqllFOri6l5nBR5qs/jiAoEo=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=lKDPxnyFMYP6lsDUaojZFrgdIpXQuFcXehhvbFGFwtYfMVJJdCfW5fjrEI5WujI0f nWcuxjcz/5W2zriu2QFzV9LNl6aFYV+VGS2Kyu5UYjZ/r7myg3R69jwdzH8wTFSL3/ 5fcT5TAOiTzMpDobLg6KARjQhq2qOwiVuQ6u7jxTH5AzNIojixXcrQ/1rJSYgY1nf3 5ofLheTX0lz8SKwNMg4RUlc4vSx5LA1a0xZSgJ4cPdX0KRe7HFo2iZR3usR3ekeVnr +ztylJks1+CpoQFuiAAa7fnnQ0A0bZuFdmagIM5FTjPCvHlTjbJIq58ECc9rY0WUfS DYWrqz2d2kfcA== To: Miguel Ojeda , Wedson Almeida Filho , Alex Gaynor From: Benno Lossin Cc: Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Alice Ryhl , Andreas Hindborg , rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 02/13] rust: init: make `#[pin_data]` compatible with conditional compilation of fields Message-ID: <20230729090838.225225-3-benno.lossin@proton.me> In-Reply-To: <20230729090838.225225-1-benno.lossin@proton.me> References: <20230729090838.225225-1-benno.lossin@proton.me> Feedback-ID: 71780778:user:proton MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,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: INBOX X-GMAIL-THRID: 1772747604167218635 X-GMAIL-MSGID: 1772747604167218635 This patch allows one to write ``` #[pin_data] pub struct Foo { #[cfg(CONFIG_BAR)] a: Bar, #[cfg(not(CONFIG_BAR))] a: Baz, } ``` Before, this would result in a compile error, because `#[pin_data]` would generate two functions named `a` for both fields unconditionally. Signed-off-by: Benno Lossin Reviewed-by: Alice Ryhl Reviewed-by: Gary Guo Reviewed-by: Martin Rodriguez Reboredo --- rust/kernel/init/macros.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rust/kernel/init/macros.rs b/rust/kernel/init/macros.rs index fbaebd34f218..9182fdf99e7e 100644 --- a/rust/kernel/init/macros.rs +++ b/rust/kernel/init/macros.rs @@ -962,6 +962,7 @@ impl<$($impl_generics)*> $pin_data<$($ty_generics)*> where $($whr)* { $( + $(#[$($p_attr)*])* $pvis unsafe fn $p_field( self, slot: *mut $p_type, @@ -971,6 +972,7 @@ impl<$($impl_generics)*> $pin_data<$($ty_generics)*> } )* $( + $(#[$($attr)*])* $fvis unsafe fn $field( self, slot: *mut $type,