kvfree_call_rcu() changed the type of its parameter to kvfree_rcu_head
in commit acc6fdade62c ("mm/slab: introduce struct kvfree_rcu_head for
kvfree_rcu batching") in the slab tree

Meanwhile rust started relying on the old type in commit e5e86df8b666
("rust: poll: use kfree_rcu() for PollCondVar") in the char-misc tree.

Reconcile the two changes as suggested by Gary [1]. This should be
applied as the merge commit for either slab tree or char-misc tree,
whichever is merged to -next later. The code it changes comes from
char-misc tree.

[1] https://lore.kernel.org/all/DKFF147BG8PR.I12RKSRFQS1B@garyguo.net/

Suggested-by: Gary Guo <gary@garyguo.net>
Closes: https://lore.kernel.org/all/20260731075644.20215-1-ojeda@kernel.org/
Closes: https://lore.kernel.org/all/20260731122826.737703-1-spasswolf@web.de/
Signed-off-by: Vlastimil Babka (SUSE) <vbabka@kernel.org>
---
 rust/kernel/sync/poll.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust/kernel/sync/poll.rs b/rust/kernel/sync/poll.rs
index 684dfa242b1a..f3cdf95db12d 100644
--- a/rust/kernel/sync/poll.rs
+++ b/rust/kernel/sync/poll.rs
@@ -124,7 +124,7 @@ pub struct PollCondVarBox {
 struct PollCondVarBoxInner {
     #[pin]
     inner: PollCondVar,
-    rcu: Opaque<bindings::callback_head>,
+    rcu: Opaque<bindings::kvfree_rcu_head>,
 }
 
 // SAFETY: PollCondVar is Send

---
base-commit: 1701fda2f58e345c050f4309971bdc07cd6146ba
change-id: 20260805-slab-rust-fix-b1828ce329e3

On Wed, Aug 05, 2026 at 06:28:45PM +0200, Vlastimil Babka (SUSE) wrote:
> kvfree_call_rcu() changed the type of its parameter to kvfree_rcu_head
> in commit acc6fdade62c ("mm/slab: introduce struct kvfree_rcu_head for
> kvfree_rcu batching") in the slab tree

That should be applied tomorrow.