]> www.infradead.org Git - users/jedix/linux-maple.git/commit
rust: alloc: fix `rusttest` by providing `Cmalloc::aligned_layout` too
authorMiguel Ojeda <ojeda@kernel.org>
Sat, 16 Aug 2025 20:42:15 +0000 (22:42 +0200)
committerDanilo Krummrich <dakr@kernel.org>
Sat, 16 Aug 2025 23:29:21 +0000 (01:29 +0200)
commit0f580d5d3d9d9cd0953695cd32e43aac3a946338
tree9b439796155739b1c4e358a72949e8a77935440d
parenta44458dfd5bc0c79c6739c3f4c658361d3a5126b
rust: alloc: fix `rusttest` by providing `Cmalloc::aligned_layout` too

Commit fde578c86281 ("rust: alloc: replace aligned_size() with
Kmalloc::aligned_layout()") provides a public `aligned_layout` function
in `Kamlloc`, but not in `Cmalloc`, and thus uses of it will trigger an
error in `rusttest`.

Such a user appeared in the following commit 22ab0641b939 ("rust: drm:
ensure kmalloc() compatible Layout"):

    error[E0599]: no function or associated item named `aligned_layout` found for struct `alloc::allocator_test::Cmalloc` in the current scope
       --> rust/kernel/drm/device.rs:100:31
        |
    100 |         let layout = Kmalloc::aligned_layout(Layout::new::<Self>());
        |                               ^^^^^^^^^^^^^^ function or associated item not found in `Cmalloc`
        |
       ::: rust/kernel/alloc/allocator_test.rs:19:1
        |
    19  | pub struct Cmalloc;
        | ------------------ function or associated item `aligned_layout` not found for this struct

Thus add an equivalent one for `Cmalloc`.

Fixes: fde578c86281 ("rust: alloc: replace aligned_size() with Kmalloc::aligned_layout()")
Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
Link: https://lore.kernel.org/r/20250816204215.2719559-1-ojeda@kernel.org
Signed-off-by: Danilo Krummrich <dakr@kernel.org>
rust/kernel/alloc/allocator_test.rs