Merge branch 'slab/for-6.9/slab-flag-cleanups' into slab/for-linus

[sfrench/cifs-2.6.git] / mm / slab_common.c

diff --git a/mm/slab_common.c b/mm/slab_common.c
index 7d60cfc2b30f68c83abf218206c050dc5ecf833d..23af762148cacf386bc051189ab1a758518921aa 100644 (file)
--- 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)