diff options
| author | Benno Lossin <benno.lossin@proton.me> | 2023-08-14 08:46:31 +0000 |
|---|---|---|
| committer | Miguel Ojeda <ojeda@kernel.org> | 2023-08-21 14:31:48 +0200 |
| commit | f8badd150763ae0f9c8482fabe0fdbac81735d34 (patch) | |
| tree | 2e751ab3ffa7184d23860e104b136c0db44eb15b /rust | |
| parent | b3068ac37b1c10ee4b9fb6c07a2e46021376c374 (diff) | |
| download | lwn-f8badd150763ae0f9c8482fabe0fdbac81735d34.tar.gz lwn-f8badd150763ae0f9c8482fabe0fdbac81735d34.zip | |
rust: init: make `#[pin_data]` compatible with conditional compilation of fields
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.
Reviewed-by: Martin Rodriguez Reboredo <yakoyoku@gmail.com>
Reviewed-by: Gary Guo <gary@garyguo.net>
Reviewed-by: Alice Ryhl <aliceryhl@google.com>
Signed-off-by: Benno Lossin <benno.lossin@proton.me>
Link: https://lore.kernel.org/r/20230814084602.25699-3-benno.lossin@proton.me
Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
Diffstat (limited to 'rust')
| -rw-r--r-- | rust/kernel/init/macros.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/rust/kernel/init/macros.rs b/rust/kernel/init/macros.rs index ad78dd0d9d9e..474ed36f84a5 100644 --- a/rust/kernel/init/macros.rs +++ b/rust/kernel/init/macros.rs @@ -962,6 +962,7 @@ macro_rules! __pin_data { where $($whr)* { $( + $(#[$($p_attr)*])* $pvis unsafe fn $p_field<E>( self, slot: *mut $p_type, @@ -971,6 +972,7 @@ macro_rules! __pin_data { } )* $( + $(#[$($attr)*])* $fvis unsafe fn $field<E>( self, slot: *mut $type, |