From 2355f2739db66527d6bbcba19964d4073c39ded2 Mon Sep 17 00:00:00 2001 From: Glauber Costa Date: Tue, 29 May 2012 15:07:05 -0700 Subject: [PATCH] --- yaml --- r: 308922 b: refs/heads/master c: 04eac7ffdea1090f81bc33bd8f4bf072b1fe5bdb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/res_counter.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3ab5541a7680..2091dd23cba0 100644 --- 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 index 5de7a146ead9..7d7fbe2ef782 100644 --- 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); /*