Merge 4.4.161 into android-4.4

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / mm / vmstat.c

diff --git a/mm/vmstat.c b/mm/vmstat.c
index 83a003b..5d7dd28 100644 (file)
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -738,6 +738,7 @@ const char * const vmstat_text[] = {
        "nr_slab_unreclaimable",
        "nr_page_table_pages",
        "nr_kernel_stack",
+       "nr_overhead",
        "nr_unstable",
        "nr_bounce",
        "nr_vmscan_write",
@@ -859,6 +860,9 @@ const char * const vmstat_text[] = {
 #ifdef CONFIG_SMP
        "nr_tlb_remote_flush",
        "nr_tlb_remote_flush_received",
+#else
+       "", /* nr_tlb_remote_flush */
+       "", /* nr_tlb_remote_flush_received */
 #endif /* CONFIG_SMP */
        "nr_tlb_local_flush_all",
        "nr_tlb_local_flush_one",
@@ -1093,6 +1097,8 @@ static void pagetypeinfo_showmixedcount_print(struct seq_file *m,
                                continue;
 
                        page_ext = lookup_page_ext(page);
+                       if (unlikely(!page_ext))
+                               continue;
 
                        if (!test_bit(PAGE_EXT_OWNER, &page_ext->flags))
                                continue;
@@ -1350,7 +1356,9 @@ static int vmstat_show(struct seq_file *m, void *arg)
        unsigned long *l = arg;
        unsigned long off = l - (unsigned long *)m->private;
 
-       seq_printf(m, "%s %lu\n", vmstat_text[off], *l);
+       seq_puts(m, vmstat_text[off]);
+       seq_put_decimal_ull(m, ' ', *l);
+       seq_putc(m, '\n');
        return 0;
 }