Subject: [merged] memcg-kmem-use-is_root_cache-instead-of-hard-code.patch removed from -mm tree
To: h.huangqiang@xxxxxxxxxx,glommer@xxxxxxxxxxxxx,hannes@xxxxxxxxxxx,mhocko@xxxxxxx,penberg@xxxxxxxxxx,rientjes@xxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Wed, 13 Nov 2013 12:39:24 -0800
The patch titled
Subject: memcg, kmem: use is_root_cache instead of hard code
has been removed from the -mm tree. Its filename was
memcg-kmem-use-is_root_cache-instead-of-hard-code.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Qiang Huang <h.huangqiang@xxxxxxxxxx>
Subject: memcg, kmem: use is_root_cache instead of hard code
Signed-off-by: Qiang Huang <h.huangqiang@xxxxxxxxxx>
Reviewed-by: Pekka Enberg <penberg@xxxxxxxxxx>
Acked-by: David Rientjes <rientjes@xxxxxxxxxx>
Cc: Johannes Weiner <hannes@xxxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxx>
Cc: Glauber Costa <glommer@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/memcontrol.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff -puN mm/memcontrol.c~memcg-kmem-use-is_root_cache-instead-of-hard-code mm/memcontrol.c
--- a/mm/memcontrol.c~memcg-kmem-use-is_root_cache-instead-of-hard-code
+++ a/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_
{
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;
_
Patches currently in -mm which might be from h.huangqiang@xxxxxxxxxx are
origin.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
