Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 198727
b: refs/heads/master
c: 315c199
h: refs/heads/master
i:
  198725: 7abd455
  198723: 9bf43e5
  198719: 8cded3b
v: v3
  • Loading branch information
Phil Carmody authored and Linus Torvalds committed May 27, 2010
1 parent d9c6f34 commit efd2730
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 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: 5407a56257b6ade44fd9bcac972c99845b7413cd
refs/heads/master: 315c1998e10527ff364a9883048455e609bc7232
2 changes: 1 addition & 1 deletion trunk/mm/memcontrol.c
Original file line number Diff line number Diff line change
Expand Up @@ -3563,7 +3563,7 @@ static int mem_cgroup_usage_unregister_event(struct cgroup *cgrp,
int type = MEMFILE_TYPE(cft->private);
u64 usage;
int size = 0;
int i, j, ret;
int i, j, ret = 0;

mutex_lock(&memcg->thresholds_lock);
if (type == _MEM)
Expand Down

0 comments on commit efd2730

Please sign in to comment.