From dab60b40593b241dda681a49ab57d63551e180a5 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Thu, 8 Feb 2007 14:20:40 -0800 Subject: [PATCH] --- yaml --- r: 47295 b: refs/heads/master c: a25700a53f715fde30443e737e52310c6d4a311a h: refs/heads/master i: 47293: abd695354be0f51802bb78f6694e68f637f87023 47291: ead41449d3c0546ccbe8dc72176856124a7b5762 47287: 32710cca4d87d3499e34fdbe36e98bbb355ae0c6 47279: 168c0454a9e7d3444c1d216bc6e30e98b7c515bd 47263: 71e05ed43f268dc7c4ce5575bc63a643f2564402 47231: eea2e1744b333332329874dfed6a55934ad339d2 v: v3 --- [refs] | 2 +- trunk/mm/page_alloc.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 93d2db102791..f4d3b698cbe6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 45941d0481f538324fa21d6450116d13f6e51e91 +refs/heads/master: a25700a53f715fde30443e737e52310c6d4a311a diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c index 2c606cc922a5..f12052dc23ff 100644 --- a/trunk/mm/page_alloc.c +++ b/trunk/mm/page_alloc.c @@ -1579,8 +1579,8 @@ void show_free_areas(void) get_zone_counts(&active, &inactive, &free); - printk("Active:%lu inactive:%lu dirty:%lu writeback:%lu " - "unstable:%lu free:%u slab:%lu mapped:%lu pagetables:%lu\n", + printk("Active:%lu inactive:%lu dirty:%lu writeback:%lu unstable:%lu\n" + " free:%u slab:%lu mapped:%lu pagetables:%lu bounce:%lu\n", active, inactive, global_page_state(NR_FILE_DIRTY), @@ -1590,7 +1590,8 @@ void show_free_areas(void) global_page_state(NR_SLAB_RECLAIMABLE) + global_page_state(NR_SLAB_UNRECLAIMABLE), global_page_state(NR_FILE_MAPPED), - global_page_state(NR_PAGETABLE)); + global_page_state(NR_PAGETABLE), + global_page_state(NR_BOUNCE)); for_each_zone(zone) { int i;