diff options
| author | Vlastimil Babka <vbabka@suse.cz> | 2024-03-12 10:16:56 +0100 |
|---|---|---|
| committer | Vlastimil Babka <vbabka@suse.cz> | 2024-03-12 10:16:56 +0100 |
| commit | 1a1c4e4576d439a14b2499de52b9225c69348903 (patch) | |
| tree | e348f454c74d1f89a6b028adacb254b30f8c73d0 /mm/slab_common.c | |
| parent | 466ed9eed674ae1100ef15a9fa2e2ac4aee56a47 (diff) | |
| parent | 96d8dbb6f65041b670a79e8ae76f67cc11dee203 (diff) | |
| download | linux-1a1c4e4576d439a14b2499de52b9225c69348903.tar.gz linux-1a1c4e4576d439a14b2499de52b9225c69348903.tar.bz2 linux-1a1c4e4576d439a14b2499de52b9225c69348903.zip | |
Merge branch 'slab/for-6.9/slab-flag-cleanups' into slab/for-linus
Merge a series from myself that replaces hardcoded SLAB_ cache flag
values with an enum, and explicitly deprecates the SLAB_MEM_SPREAD flag
that is a no-op sine SLAB removal.
Diffstat (limited to 'mm/slab_common.c')
| -rw-r--r-- | mm/slab_common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/slab_common.c b/mm/slab_common.c index 7d60cfc2b30f..23af762148ca 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c @@ -50,7 +50,7 @@ static DECLARE_WORK(slab_caches_to_rcu_destroy_work, */ #define SLAB_NEVER_MERGE (SLAB_RED_ZONE | SLAB_POISON | SLAB_STORE_USER | \ SLAB_TRACE | SLAB_TYPESAFE_BY_RCU | SLAB_NOLEAKTRACE | \ - SLAB_FAILSLAB | SLAB_NO_MERGE | kasan_never_merge()) + SLAB_FAILSLAB | SLAB_NO_MERGE) #define SLAB_MERGE_SAME (SLAB_RECLAIM_ACCOUNT | SLAB_CACHE_DMA | \ SLAB_CACHE_DMA32 | SLAB_ACCOUNT) |