mm: migrate: Add a tracepoint for migrate_pages

[deliverable/linux.git] / mm / vmstat.c

diff --git a/mm/vmstat.c b/mm/vmstat.c
index 05e3a99137444506970543bee749bb4f6897de39..89a7fd665b320977527a5da3edf893e5ffc282c8 100644 (file)
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -495,6 +495,18 @@ void refresh_cpu_vm_stats(int cpu)
                        atomic_long_add(global_diff[i], &vm_stat[i]);
 }
 
+void drain_zonestat(struct zone *zone, struct per_cpu_pageset *pset)
+{
+       int i;
+
+       for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
+               if (pset->vm_stat_diff[i]) {
+                       int v = pset->vm_stat_diff[i];
+                       pset->vm_stat_diff[i] = 0;
+                       atomic_long_add(v, &zone->vm_stat[i]);
+                       atomic_long_add(v, &vm_stat[i]);
+               }
+}
 #endif
 
 #ifdef CONFIG_NUMA
@@ -762,10 +774,11 @@ const char * const vmstat_text[] = {
 
        "pgrotated",
 
+#ifdef CONFIG_MIGRATION
+       "pgmigrate_success",
+       "pgmigrate_fail",
+#endif
 #ifdef CONFIG_COMPACTION
-       "compact_blocks_moved",
-       "compact_pages_moved",
-       "compact_pagemigrate_failed",
        "compact_stall",
        "compact_fail",
        "compact_success",
@@ -782,7 +795,6 @@ const char * const vmstat_text[] = {
        "unevictable_pgs_munlocked",
        "unevictable_pgs_cleared",
        "unevictable_pgs_stranded",
-       "unevictable_pgs_mlockfreed",   /* no longer useful: always zero */
 
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
        "thp_fault_alloc",