Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 284389
b: refs/heads/master
c: 3ed28fa
h: refs/heads/master
i:
  284387: a93ef5a
v: v3
  • Loading branch information
Bob Liu authored and Linus Torvalds committed Jan 13, 2012
1 parent c07140e commit 4fbf2f4
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 38c5d72f3ebe5ddd57d2f08dc035070fc6c9a287
refs/heads/master: 3ed28fa1080c73747ce17f2025b28b062fb5aa7f
10 changes: 5 additions & 5 deletions trunk/mm/memcontrol.c
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,7 @@ static void mem_cgroup_remove_from_trees(struct mem_cgroup *memcg)
struct mem_cgroup_per_zone *mz;
struct mem_cgroup_tree_per_zone *mctz;

for_each_node_state(node, N_POSSIBLE) {
for_each_node(node) {
for (zone = 0; zone < MAX_NR_ZONES; zone++) {
mz = mem_cgroup_zoneinfo(memcg, node, zone);
mctz = soft_limit_tree_node_zone(node, zone);
Expand Down Expand Up @@ -4818,7 +4818,7 @@ static void __mem_cgroup_free(struct mem_cgroup *memcg)
mem_cgroup_remove_from_trees(memcg);
free_css_id(&mem_cgroup_subsys, &memcg->css);

for_each_node_state(node, N_POSSIBLE)
for_each_node(node)
free_mem_cgroup_per_zone_info(memcg, node);

free_percpu(memcg->stat);
Expand Down Expand Up @@ -4877,7 +4877,7 @@ static int mem_cgroup_soft_limit_tree_init(void)
struct mem_cgroup_tree_per_zone *rtpz;
int tmp, node, zone;

for_each_node_state(node, N_POSSIBLE) {
for_each_node(node) {
tmp = node;
if (!node_state(node, N_NORMAL_MEMORY))
tmp = -1;
Expand All @@ -4896,7 +4896,7 @@ static int mem_cgroup_soft_limit_tree_init(void)
return 0;

err_cleanup:
for_each_node_state(node, N_POSSIBLE) {
for_each_node(node) {
if (!soft_limit_tree.rb_tree_per_node[node])
break;
kfree(soft_limit_tree.rb_tree_per_node[node]);
Expand All @@ -4917,7 +4917,7 @@ mem_cgroup_create(struct cgroup_subsys *ss, struct cgroup *cont)
if (!memcg)
return ERR_PTR(error);

for_each_node_state(node, N_POSSIBLE)
for_each_node(node)
if (alloc_mem_cgroup_per_zone_info(memcg, node))
goto free_out;

Expand Down

0 comments on commit 4fbf2f4

Please sign in to comment.