Merge branch 'akpm' (Andrew's patch-bomb)

[karo-tx-linux.git] / Documentation / cgroups / resource_counter.txt

diff --git a/Documentation/cgroups/resource_counter.txt b/Documentation/cgroups/resource_counter.txt
index 95b24d766eab755ac443f095ff613a638494bafb..0c4a344e78fa4c32693bf231240597bee5a8fe2b 100644 (file)
--- a/Documentation/cgroups/resource_counter.txt
+++ b/Documentation/cgroups/resource_counter.txt
@@ -77,11 +77,11 @@ to work with it.
        where the charging failed.
 
  d. int res_counter_charge_locked
-                       (struct res_counter *rc, unsigned long val)
+                       (struct res_counter *rc, unsigned long val, bool force)
 
        The same as res_counter_charge(), but it must not acquire/release the
        res_counter->lock internally (it must be called with res_counter->lock
-       held).
+       held). The force parameter indicates whether we can bypass the limit.
 
  e. void res_counter_uncharge[_locked]
                        (struct res_counter *rc, unsigned long val)
@@ -92,6 +92,14 @@ to work with it.
 
        The _locked routines imply that the res_counter->lock is taken.
 
+ f. void res_counter_uncharge_until
+               (struct res_counter *rc, struct res_counter *top,
+                unsinged long val)
+
+       Almost same as res_cunter_uncharge() but propagation of uncharge
+       stops when rc == top. This is useful when kill a res_coutner in
+       child cgroup.
+
  2.1 Other accounting routines
 
     There are more routines that may help you with common needs, like