---

yaml --- r: 308922 b: refs/heads/master c: 04eac7f h: refs/heads/master v: v3
git-mirror · May 29, 2012 · 2355f27 · 2355f27
1 parent 42cf7d9
commit 2355f27
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: 2f3479b1478e223f142fe9cd27a2d2a4c3573c53
+refs/heads/master: 04eac7ffdea1090f81bc33bd8f4bf072b1fe5bdb
diff --git a/trunk/include/linux/res_counter.h b/trunk/include/linux/res_counter.h
@@ -119,7 +119,7 @@ int __must_check res_counter_charge_locked(struct res_counter *counter,
 					   unsigned long val, bool force);
 int __must_check res_counter_charge(struct res_counter *counter,
 		unsigned long val, struct res_counter **limit_fail_at);
-int __must_check res_counter_charge_nofail(struct res_counter *counter,
+int res_counter_charge_nofail(struct res_counter *counter,
 		unsigned long val, struct res_counter **limit_fail_at);
 
 /*