aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2007-02-08 17:20:40 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-09 12:25:47 -0500
commita25700a53f715fde30443e737e52310c6d4a311a (patch)
tree7f0593a68d7c791f3d01ce04f061b534fa26db91
parent45941d0481f538324fa21d6450116d13f6e51e91 (diff)
[PATCH] mm: show bounce pages in oom killer output
Also split that long line up - people like to send us wordwrapped oom-kill traces. Cc: Nick Piggin <nickpiggin@yahoo.com.au> Cc: Christoph Lameter <clameter@engr.sgi.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--mm/page_alloc.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 2c606cc922a5..f12052dc23ff 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -1579,8 +1579,8 @@ void show_free_areas(void)
1579 1579
1580 get_zone_counts(&active, &inactive, &free); 1580 get_zone_counts(&active, &inactive, &free);
1581 1581
1582 printk("Active:%lu inactive:%lu dirty:%lu writeback:%lu " 1582 printk("Active:%lu inactive:%lu dirty:%lu writeback:%lu unstable:%lu\n"
1583 "unstable:%lu free:%u slab:%lu mapped:%lu pagetables:%lu\n", 1583 " free:%u slab:%lu mapped:%lu pagetables:%lu bounce:%lu\n",
1584 active, 1584 active,
1585 inactive, 1585 inactive,
1586 global_page_state(NR_FILE_DIRTY), 1586 global_page_state(NR_FILE_DIRTY),
@@ -1590,7 +1590,8 @@ void show_free_areas(void)
1590 global_page_state(NR_SLAB_RECLAIMABLE) + 1590 global_page_state(NR_SLAB_RECLAIMABLE) +
1591 global_page_state(NR_SLAB_UNRECLAIMABLE), 1591 global_page_state(NR_SLAB_UNRECLAIMABLE),
1592 global_page_state(NR_FILE_MAPPED), 1592 global_page_state(NR_FILE_MAPPED),
1593 global_page_state(NR_PAGETABLE)); 1593 global_page_state(NR_PAGETABLE),
1594 global_page_state(NR_BOUNCE));
1594 1595
1595 for_each_zone(zone) { 1596 for_each_zone(zone) {
1596 int i; 1597 int i;