diff options
| author | Vlastimil Babka <vbabka@suse.cz> | 2024-07-15 10:44:16 +0200 |
|---|---|---|
| committer | Vlastimil Babka <vbabka@suse.cz> | 2024-07-15 10:44:16 +0200 |
| commit | 436381eaf2a423e60fc8340399f7d2458091b383 (patch) | |
| tree | 16ecce9d2dcb5ed43de60a966e9026c9ffd6e711 /lib | |
| parent | mm/memcg: alignment memcg_data define condition (diff) | |
| parent | mm/util: Use dedicated slab buckets for memdup_user() (diff) | |
| download | linux-436381eaf2a423e60fc8340399f7d2458091b383.tar.xz linux-436381eaf2a423e60fc8340399f7d2458091b383.zip | |
Merge branch 'slab/for-6.11/buckets' into slab/for-next
Merge all the slab patches previously collected on top of v6.10-rc1,
over cleanups/fixes that had to be based on rc6.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/fortify_kunit.c | 2 | ||||
| -rw-r--r-- | lib/slub_kunit.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/lib/fortify_kunit.c b/lib/fortify_kunit.c index e17d520f532c..9a7f9367b8f2 100644 --- a/lib/fortify_kunit.c +++ b/lib/fortify_kunit.c @@ -234,8 +234,6 @@ static void fortify_test_alloc_size_##allocator##_dynamic(struct kunit *test) \ checker(expected_size, \ kmalloc_array_node(alloc_size, 1, gfp, NUMA_NO_NODE), \ kfree(p)); \ - checker(expected_size, __kmalloc(alloc_size, gfp), \ - kfree(p)); \ \ orig = kmalloc(alloc_size, gfp); \ KUNIT_EXPECT_TRUE(test, orig != NULL); \ diff --git a/lib/slub_kunit.c b/lib/slub_kunit.c index 4ce960438806..e6667a28c014 100644 --- a/lib/slub_kunit.c +++ b/lib/slub_kunit.c @@ -140,7 +140,7 @@ static void test_kmalloc_redzone_access(struct kunit *test) { struct kmem_cache *s = test_kmem_cache_create("TestSlub_RZ_kmalloc", 32, SLAB_KMALLOC|SLAB_STORE_USER|SLAB_RED_ZONE); - u8 *p = kmalloc_trace(s, GFP_KERNEL, 18); + u8 *p = __kmalloc_cache_noprof(s, GFP_KERNEL, 18); kasan_disable_current(); |