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;