Merge tag 'v3.10.95' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / mm / vmstat.c

diff --git a/mm/vmstat.c b/mm/vmstat.c
index f42745e65780b97a1875cde1df81fe527350d59a..de839fb72e3843c6a27cc00c6fa86bef3c0d2a73 100644 (file)
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -626,6 +626,9 @@ static char * const migratetype_names[MIGRATE_TYPES] = {
        "Unmovable",
        "Reclaimable",
        "Movable",
+#ifdef CONFIG_MTKPASR
+       "Mtkpasr",
+#endif
        "Reserve",
 #ifdef CONFIG_CMA
        "CMA",
@@ -756,6 +759,7 @@ const char * const vmstat_text[] = {
 
        "pgfault",
        "pgmajfault",
+       "pgfmfault",
 
        TEXTS_FOR_ZONES("pgrefill")
        TEXTS_FOR_ZONES("pgsteal_kswapd")
@@ -779,6 +783,7 @@ const char * const vmstat_text[] = {
 
 #ifdef CONFIG_NUMA_BALANCING
        "numa_pte_updates",
+       "numa_huge_pte_updates",
        "numa_hint_faults",
        "numa_hint_faults_local",
        "numa_pages_migrated",