X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=mm%2Fslab_common.c;h=e016178063e19e86c21a46ea4a39ced03b0fe001;hb=eef1b3ba053aa68967d294c80a50c4a26db30f52;hp=3c6a86b4ec25f8462c1584dcb5bcf01e4edbd4ff;hpb=3273cba1956437820ae25d98e3ae57d1c094205c;p=deliverable%2Flinux.git

diff --git a/mm/slab_common.c b/mm/slab_common.c
index 3c6a86b4ec25..e016178063e1 100644
--- a/mm/slab_common.c
+++ b/mm/slab_common.c
@@ -37,7 +37,8 @@ struct kmem_cache *kmem_cache;
 		SLAB_TRACE | SLAB_DESTROY_BY_RCU | SLAB_NOLEAKTRACE | \
 		SLAB_FAILSLAB)
 
-#define SLAB_MERGE_SAME (SLAB_RECLAIM_ACCOUNT | SLAB_CACHE_DMA | SLAB_NOTRACK)
+#define SLAB_MERGE_SAME (SLAB_RECLAIM_ACCOUNT | SLAB_CACHE_DMA | \
+			 SLAB_NOTRACK | SLAB_ACCOUNT)
 
 /*
  * Merge control. If this is set then no merging of slab caches will occur.