diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-09-24 06:59:11 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-09-24 06:59:18 -0400 |
commit | d2ff6de537c61a0f05731c6679f3e1abc2d95e68 (patch) | |
tree | 821aa38121f57a9d5419388ef10ea6f3aa445d4d /mm/vmstat.c | |
parent | e23a8b6a8f319c0f08b6ccef2dccbb37e7603dc2 (diff) | |
parent | a724eada8c2a7b62463b73ccf73fd0bb6e928aeb (diff) |
Merge branch 'linus' into x86/urgent
Merge reason: Queueing up dependent early-printk fix.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'mm/vmstat.c')
-rw-r--r-- | mm/vmstat.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mm/vmstat.c b/mm/vmstat.c index 138bed53706e..c81321f9feec 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c | |||
@@ -639,11 +639,14 @@ static const char * const vmstat_text[] = { | |||
639 | "nr_slab_reclaimable", | 639 | "nr_slab_reclaimable", |
640 | "nr_slab_unreclaimable", | 640 | "nr_slab_unreclaimable", |
641 | "nr_page_table_pages", | 641 | "nr_page_table_pages", |
642 | "nr_kernel_stack", | ||
642 | "nr_unstable", | 643 | "nr_unstable", |
643 | "nr_bounce", | 644 | "nr_bounce", |
644 | "nr_vmscan_write", | 645 | "nr_vmscan_write", |
645 | "nr_writeback_temp", | 646 | "nr_writeback_temp", |
646 | 647 | "nr_isolated_anon", | |
648 | "nr_isolated_file", | ||
649 | "nr_shmem", | ||
647 | #ifdef CONFIG_NUMA | 650 | #ifdef CONFIG_NUMA |
648 | "numa_hit", | 651 | "numa_hit", |
649 | "numa_miss", | 652 | "numa_miss", |