1 files changed, 1 insertions, 2 deletions
diff --git a/mm/slab_common.c b/mm/slab_common.c
index 3e5f8f29c286..86831105a09f 100644
--- a/mm/slab_common.c
+++ b/mm/slab_common.c
@@ -37,8 +37,7 @@ struct kmem_cache *kmem_cache;
                SLAB_TRACE | SLAB_DESTROY_BY_RCU | SLAB_NOLEAKTRACE | \
                SLAB_FAILSLAB)
-#define SLAB_MERGE_SAME (SLAB_DEBUG_FREE | SLAB_RECLAIM_ACCOUNT | \
+#define SLAB_MERGE_SAME (SLAB_RECLAIM_ACCOUNT | SLAB_CACHE_DMA | SLAB_NOTRACK)
-                SLAB_CACHE_DMA | SLAB_NOTRACK)
 /*
 * Merge control. If this is set then no merging of slab caches will occur.

diff --git a/mm/slab_common.c b/mm/slab_common.c index 3e5f8f29c286..86831105a09f 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c
@@ -37,8 +37,7 @@ struct kmem_cache *kmem_cache;
37	SLAB_TRACE \| SLAB_DESTROY_BY_RCU \| SLAB_NOLEAKTRACE \| \	37	SLAB_TRACE \| SLAB_DESTROY_BY_RCU \| SLAB_NOLEAKTRACE \| \
38	SLAB_FAILSLAB)	38	SLAB_FAILSLAB)
39		39
40	#define SLAB_MERGE_SAME (SLAB_DEBUG_FREE \| SLAB_RECLAIM_ACCOUNT \| \	40	#define SLAB_MERGE_SAME (SLAB_RECLAIM_ACCOUNT \| SLAB_CACHE_DMA \| SLAB_NOTRACK)
41	SLAB_CACHE_DMA \| SLAB_NOTRACK)
42		41
43	/*	42	/*
44	* Merge control. If this is set then no merging of slab caches will occur.	43	* Merge control. If this is set then no merging of slab caches will occur.