summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQiang Huang <h.huangqiang@huawei.com>2013-11-12 15:08:22 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-11-13 12:09:10 +0900
commitf35c3a8eed52878c2dde9c4b9a87b276127f7f8d (patch)
tree700a9504da128ad71421e7d9907736f8e7d056d9
parent2afc745f3e3079ab16c826be4860da2529054dd2 (diff)
downloadop-kernel-dev-f35c3a8eed52878c2dde9c4b9a87b276127f7f8d.zip
op-kernel-dev-f35c3a8eed52878c2dde9c4b9a87b276127f7f8d.tar.gz
memcg, kmem: use is_root_cache instead of hard code
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com> Reviewed-by: Pekka Enberg <penberg@kernel.org> Acked-by: David Rientjes <rientjes@google.com> Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: Michal Hocko <mhocko@suse.cz> Cc: Glauber Costa <glommer@parallels.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--mm/memcontrol.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index c890724..3d28d5a 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -59,6 +59,7 @@
#include <net/sock.h>
#include <net/ip.h>
#include <net/tcp_memcontrol.h>
+#include "slab.h"
#include <asm/uaccess.h>
@@ -3131,7 +3132,7 @@ int memcg_update_cache_size(struct kmem_cache *s, int num_groups)
{
struct memcg_cache_params *cur_params = s->memcg_params;
- VM_BUG_ON(s->memcg_params && !s->memcg_params->is_root_cache);
+ VM_BUG_ON(!is_root_cache(s));
if (num_groups > memcg_limited_groups_array_size) {
int i;
OpenPOWER on IntegriCloud