From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 13 Nov 2013 06:21:53 +0000 (+0900)
Subject: Merge branch 'for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a9986464564609dd0962e6023513f7d3d313dc80;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'for-3.13' of git://git./linux/kernel/git/tj/cgroup

Pull cgroup changes from Tejun Heo:
 "Not too much activity this time around.  css_id is finally killed and
  a minor update to device_cgroup"

* 'for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
  device_cgroup: remove can_attach
  cgroup: kill css_id
  memcg: stop using css id
  memcg: fail to create cgroup if the cgroup id is too big
  memcg: convert to use cgroup id
  memcg: convert to use cgroup_is_descendant()
---

a9986464564609dd0962e6023513f7d3d313dc80
diff --cc mm/memcontrol.c
index 13b9d0f221b8,65a46eff5c3d..796820925de0
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@@ -6165,9 -5979,6 +6178,8 @@@ static void __mem_cgroup_free(struct me
  	int node;
  	size_t size = memcg_size();
  
 +	mem_cgroup_remove_from_trees(memcg);
- 	free_css_id(&mem_cgroup_subsys, &memcg->css);
 +
  	for_each_node(node)
  		free_mem_cgroup_per_zone_info(memcg, node);