From 4979e0a8c564bfac2d8eba2afa470a727cb897d6 Mon Sep 17 00:00:00 2001
From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Wed, 25 Apr 2012 01:11:36 +0200
Subject: [PATCH] --- yaml --- r: 304803 b: refs/heads/master c:
 0d4dde1ac9a5af74ac76c6ab90557d1ae7b8f5d8 h: refs/heads/master i:   304801:
 1e7ff31f844810e146b93f72c93e9238550df371   304799:
 991e46ad8c20b3b78f1fa33387374b2a993dbcec v: v3

---
 [refs]                     | 2 +-
 trunk/kernel/res_counter.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5bbab35b78ec..ecd7c9d002d9 100644
--- 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
index 07a29923aba2..bebe2b170d49 100644
--- 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;
 }