This is a note to let you know that I've just added the patch titled
rust: macros: vtable: fix `HAS_*` redefinition (`gen_const_name`)
to the 6.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
rust-macros-vtable-fix-has_-redefinition-gen_const_name.patch
and it can be found in the queue-6.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 3fa7187eceee11998f756481e45ce8c4f9d9dc48 Mon Sep 17 00:00:00 2001
From: Qingsong Chen <changxian.cqs@xxxxxxxxxxxx>
Date: Tue, 8 Aug 2023 10:54:01 +0800
Subject: rust: macros: vtable: fix `HAS_*` redefinition (`gen_const_name`)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Qingsong Chen <changxian.cqs@xxxxxxxxxxxx>
commit 3fa7187eceee11998f756481e45ce8c4f9d9dc48 upstream.
If we define the same function name twice in a trait (using `#[cfg]`),
the `vtable` macro will redefine its `gen_const_name`, e.g. this will
define `HAS_BAR` twice:
#[vtable]
pub trait Foo {
#[cfg(CONFIG_X)]
fn bar();
#[cfg(not(CONFIG_X))]
fn bar(x: usize);
}
Fixes: b44becc5ee80 ("rust: macros: add `#[vtable]` proc macro")
Signed-off-by: Qingsong Chen <changxian.cqs@xxxxxxxxxxxx>
Reviewed-by: Andreas Hindborg <a.hindborg@xxxxxxxxxxx>
Reviewed-by: Gary Guo <gary@xxxxxxxxxxx>
Reviewed-by: Sergio González Collado <sergio.collado@xxxxxxxxx>
Link: https://lore.kernel.org/r/20230808025404.2053471-1-changxian.cqs@xxxxxxxxxxxx
Signed-off-by: Miguel Ojeda <ojeda@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
rust/macros/vtable.rs | 1 +
1 file changed, 1 insertion(+)
diff --git a/rust/macros/vtable.rs b/rust/macros/vtable.rs
index 34d5e7fb5768..ee06044fcd4f 100644
--- a/rust/macros/vtable.rs
+++ b/rust/macros/vtable.rs
@@ -74,6 +74,7 @@ pub(crate) fn vtable(_attr: TokenStream, ts: TokenStream) -> TokenStream {
const {gen_const_name}: bool = false;",
)
.unwrap();
+ consts.insert(gen_const_name);
}
} else {
const_items = "const USE_VTABLE_ATTR: () = ();".to_owned();
--
2.41.0
Patches currently in stable-queue which might be from changxian.cqs@xxxxxxxxxxxx are
queue-6.4/rust-macros-vtable-fix-has_-redefinition-gen_const_name.patch
