Memory controller: memory accounting

[sfrench/cifs-2.6.git] / mm / migrate.c

diff --git a/mm/migrate.c b/mm/migrate.c
index 857a987e36904a5850a4d663c6d9e41e494ffe1f..417bbda14e5b749b9c8512ac1b44ebcb31c346f1 100644 (file)
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -29,6 +29,7 @@
 #include <linux/mempolicy.h>
 #include <linux/vmalloc.h>
 #include <linux/security.h>
+#include <linux/memcontrol.h>
 
 #include "internal.h"
 
@@ -152,6 +153,11 @@ static void remove_migration_pte(struct vm_area_struct *vma,
                return;
        }
 
+       if (mem_cgroup_charge(new, mm)) {
+               pte_unmap(ptep);
+               return;
+       }
+
        ptl = pte_lockptr(mm, pmd);
        spin_lock(ptl);
        pte = *ptep;