Merge branch 'async-scsi-resume' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux.git] / Documentation / cgroups / memcg_test.txt

diff --git a/Documentation/cgroups/memcg_test.txt b/Documentation/cgroups/memcg_test.txt
index ce94a83a7d9ae54e11bcc8483ac3a607516e0639..80ac454704b80903ba20dc4c00785d1f1eed9bf0 100644 (file)
--- a/Documentation/cgroups/memcg_test.txt
+++ b/Documentation/cgroups/memcg_test.txt
@@ -24,7 +24,7 @@ Please note that implementation details can be changed.
 
    a page/swp_entry may be charged (usage += PAGE_SIZE) at
 
-       mem_cgroup_newpage_charge()
+       mem_cgroup_charge_anon()
          Called at new page fault and Copy-On-Write.
 
        mem_cgroup_try_charge_swapin()
@@ -32,7 +32,7 @@ Please note that implementation details can be changed.
          Followed by charge-commit-cancel protocol. (With swap accounting)
          At commit, a charge recorded in swap_cgroup is removed.
 
-       mem_cgroup_cache_charge()
+       mem_cgroup_charge_file()
          Called at add_to_page_cache()
 
        mem_cgroup_cache_charge_swapin()