CGroup API files: use cgroup map for memcontrol stats file

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

diff --git a/mm/vmstat.c b/mm/vmstat.c
index 879bcc0a1d4c77868880555409bab4918c390f8f..ec6035eda933f463ceaa849e8f9f96663a2a025f 100644 (file)
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -322,6 +322,7 @@ void refresh_cpu_vm_stats(int cpu)
                                p->expire = 3;
 #endif
                        }
+               cond_resched();
 #ifdef CONFIG_NUMA
                /*
                 * Deal with draining the remote pageset of this
@@ -645,6 +646,10 @@ static const char * const vmstat_text[] = {
        "allocstall",
 
        "pgrotated",
+#ifdef CONFIG_HUGETLB_PAGE
+       "htlb_buddy_alloc_success",
+       "htlb_buddy_alloc_fail",
+#endif
 #endif
 };