vmstat: Remove BUG_ON from vmstat_update

[linux-drm-fsl-dcu.git] / mm / vmstat.c

diff --git a/mm/vmstat.c b/mm/vmstat.c
index 83a003bc3cae54e3c2b1071249a5c282f70d3220..40b2c74ddf16d69abc52574c469d9f22dd49cf03 100644 (file)
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -783,6 +783,7 @@ const char * const vmstat_text[] = {
 
        "pgfault",
        "pgmajfault",
+       "pglazyfreed",
 
        TEXTS_FOR_ZONES("pgrefill")
        TEXTS_FOR_ZONES("pgsteal_kswapd")
@@ -844,7 +845,9 @@ const char * const vmstat_text[] = {
        "thp_fault_fallback",
        "thp_collapse_alloc",
        "thp_collapse_alloc_failed",
-       "thp_split",
+       "thp_split_page",
+       "thp_split_page_failed",
+       "thp_split_pmd",
        "thp_zero_page_alloc",
        "thp_zero_page_alloc_failed",
 #endif
@@ -1405,17 +1408,7 @@ static void vmstat_update(struct work_struct *w)
                 * Defer the checking for differentials to the
                 * shepherd thread on a different processor.
                 */
-               int r;
-               /*
-                * Shepherd work thread does not race since it never
-                * changes the bit if its zero but the cpu
-                * online / off line code may race if
-                * worker threads are still allowed during
-                * shutdown / startup.
-                */
-               r = cpumask_test_and_set_cpu(smp_processor_id(),
-                       cpu_stat_off);
-               VM_BUG_ON(r);
+               cpumask_set_cpu(smp_processor_id(), cpu_stat_off);
        }
 }