---

yaml --- r: 304803 b: refs/heads/master c: 0d4dde1 h: refs/heads/master i: 304801: 1e7ff31 304799: 991e46a v: v3
git-mirror · Apr 27, 2012 · 4979e0a · 4979e0a
1 parent 86e1d97
commit 4979e0a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4d8438f044d8aaac6fbba98316ba484dabea397d
+refs/heads/master: 0d4dde1ac9a5af74ac76c6ab90557d1ae7b8f5d8
diff --git a/trunk/kernel/res_counter.c b/trunk/kernel/res_counter.c
@@ -35,7 +35,7 @@ int res_counter_charge_locked(struct res_counter *counter, unsigned long val,
 	}
 
 	counter->usage += val;
-	if (!force && counter->usage > counter->max_usage)
+	if (counter->usage > counter->max_usage)
 		counter->max_usage = counter->usage;
 	return ret;
 }