[PATCH] oom: reclaim_mapped on oom

[pandora-kernel.git] / mm / vmstat.c

diff --git a/mm/vmstat.c b/mm/vmstat.c
index c1b5f41..04a9093 100644 (file)
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -435,6 +435,21 @@ struct seq_operations fragmentation_op = {
        .show   = frag_show,
 };
 
+#ifdef CONFIG_ZONE_DMA32
+#define TEXT_FOR_DMA32(xx) xx "_dma32",
+#else
+#define TEXT_FOR_DMA32(xx)
+#endif
+
+#ifdef CONFIG_HIGHMEM
+#define TEXT_FOR_HIGHMEM(xx) xx "_high",
+#else
+#define TEXT_FOR_HIGHMEM(xx)
+#endif
+
+#define TEXTS_FOR_ZONES(xx) xx "_dma", TEXT_FOR_DMA32(xx) xx "_normal", \
+                                       TEXT_FOR_HIGHMEM(xx)
+
 static char *vmstat_text[] = {
        /* Zoned VM counters */
        "nr_anon_pages",
@@ -462,10 +477,7 @@ static char *vmstat_text[] = {
        "pswpin",
        "pswpout",
 
-       "pgalloc_dma",
-       "pgalloc_dma32",
-       "pgalloc_normal",
-       "pgalloc_high",
+       TEXTS_FOR_ZONES("pgalloc")
 
        "pgfree",
        "pgactivate",
@@ -474,25 +486,10 @@ static char *vmstat_text[] = {
        "pgfault",
        "pgmajfault",
 
-       "pgrefill_dma",
-       "pgrefill_dma32",
-       "pgrefill_normal",
-       "pgrefill_high",
-
-       "pgsteal_dma",
-       "pgsteal_dma32",
-       "pgsteal_normal",
-       "pgsteal_high",
-
-       "pgscan_kswapd_dma",
-       "pgscan_kswapd_dma32",
-       "pgscan_kswapd_normal",
-       "pgscan_kswapd_high",
-
-       "pgscan_direct_dma",
-       "pgscan_direct_dma32",
-       "pgscan_direct_normal",
-       "pgscan_direct_high",
+       TEXTS_FOR_ZONES("pgrefill")
+       TEXTS_FOR_ZONES("pgsteal")
+       TEXTS_FOR_ZONES("pgscan_kswapd")
+       TEXTS_FOR_ZONES("pgscan_direct")
 
        "pginodesteal",
        "slabs_scanned",