Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile

[linux-2.6-omap-h63xx.git] / mm / vmstat.c

diff --git a/mm/vmstat.c b/mm/vmstat.c
index 6cb08cdd4f031e575aa9e89a937ad6a2f13ee50b..9343227c5c60b6dc3a1b7e09c64143a53a407003 100644 (file)
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -623,6 +623,10 @@ static const char * const vmstat_text[] = {
        "nr_active_anon",
        "nr_inactive_file",
        "nr_active_file",
+#ifdef CONFIG_UNEVICTABLE_LRU
+       "nr_unevictable",
+       "nr_mlock",
+#endif
        "nr_anon_pages",
        "nr_mapped",
        "nr_file_pages",
@@ -681,6 +685,11 @@ static const char * const vmstat_text[] = {
        "unevictable_pgs_culled",
        "unevictable_pgs_scanned",
        "unevictable_pgs_rescued",
+       "unevictable_pgs_mlocked",
+       "unevictable_pgs_munlocked",
+       "unevictable_pgs_cleared",
+       "unevictable_pgs_stranded",
+       "unevictable_pgs_mlockfreed",
 #endif
 #endif
 };