Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[uclinux-h8/linux.git] / mm / vmstat.c

diff --git a/mm/vmstat.c b/mm/vmstat.c
index 69ce64f..5e43004 100644 (file)
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -826,6 +826,7 @@ const char * const vmstat_text[] = {
        "compact_stall",
        "compact_fail",
        "compact_success",
+       "compact_daemon_wake",
 #endif
 
 #ifdef CONFIG_HUGETLB_PAGE
@@ -847,6 +848,7 @@ const char * const vmstat_text[] = {
        "thp_collapse_alloc_failed",
        "thp_split_page",
        "thp_split_page_failed",
+       "thp_deferred_split_page",
        "thp_split_pmd",
        "thp_zero_page_alloc",
        "thp_zero_page_alloc_failed",