summaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorVladimir Davydov <vdavydov@parallels.com>2014-08-07 03:07:33 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-08-07 05:01:21 +0400
commitaee52cae00ba0d426a827b761920a476a08eca9e (patch)
treea729419a79cc680741830016bda5bdf471b60cbb /mm
parent9ef0a0ffa28edbf5c7cfa6be73b4ecb9896a3875 (diff)
downloadlinux-aee52cae00ba0d426a827b761920a476a08eca9e.tar.xz
slub: remove kmemcg id from create_unique_id
This function is never called for memcg caches, because they are unmergeable, so remove the dead code. Signed-off-by: Vladimir Davydov <vdavydov@parallels.com> Cc: Michal Hocko <mhocko@suse.cz> Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: Christoph Lameter <cl@linux.com> Reviewed-by: Pekka Enberg <penberg@kernel.org> Cc: David Rientjes <rientjes@google.com> Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/slub.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/mm/slub.c b/mm/slub.c
index 9b861b90cde1..3e8afcc07a76 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -5128,12 +5128,6 @@ static char *create_unique_id(struct kmem_cache *s)
*p++ = '-';
p += sprintf(p, "%07d", s->size);
-#ifdef CONFIG_MEMCG_KMEM
- if (!is_root_cache(s))
- p += sprintf(p, "-%08d",
- memcg_cache_id(s->memcg_params->memcg));
-#endif
-
BUG_ON(p > name + ID_STR_LENGTH - 1);
return name;
}