aboutsummaryrefslogtreecommitdiffstats
path: root/mm/page_alloc.c
diff options
context:
space:
mode:
Diffstat (limited to 'mm/page_alloc.c')
-rw-r--r--mm/page_alloc.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index fc5b5442e942..f12052dc23ff 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -989,8 +989,7 @@ int zone_watermark_ok(struct zone *z, int order, unsigned long mark,
989 int classzone_idx, int alloc_flags) 989 int classzone_idx, int alloc_flags)
990{ 990{
991 /* free_pages my go negative - that's OK */ 991 /* free_pages my go negative - that's OK */
992 unsigned long min = mark; 992 long min = mark, free_pages = z->free_pages - (1 << order) + 1;
993 long free_pages = z->free_pages - (1 << order) + 1;
994 int o; 993 int o;
995 994
996 if (alloc_flags & ALLOC_HIGH) 995 if (alloc_flags & ALLOC_HIGH)
@@ -1580,8 +1579,8 @@ void show_free_areas(void)
1580 1579
1581 get_zone_counts(&active, &inactive, &free); 1580 get_zone_counts(&active, &inactive, &free);
1582 1581
1583 printk("Active:%lu inactive:%lu dirty:%lu writeback:%lu " 1582 printk("Active:%lu inactive:%lu dirty:%lu writeback:%lu unstable:%lu\n"
1584 "unstable:%lu free:%u slab:%lu mapped:%lu pagetables:%lu\n", 1583 " free:%u slab:%lu mapped:%lu pagetables:%lu bounce:%lu\n",
1585 active, 1584 active,
1586 inactive, 1585 inactive,
1587 global_page_state(NR_FILE_DIRTY), 1586 global_page_state(NR_FILE_DIRTY),
@@ -1591,7 +1590,8 @@ void show_free_areas(void)
1591 global_page_state(NR_SLAB_RECLAIMABLE) + 1590 global_page_state(NR_SLAB_RECLAIMABLE) +
1592 global_page_state(NR_SLAB_UNRECLAIMABLE), 1591 global_page_state(NR_SLAB_UNRECLAIMABLE),
1593 global_page_state(NR_FILE_MAPPED), 1592 global_page_state(NR_FILE_MAPPED),
1594 global_page_state(NR_PAGETABLE)); 1593 global_page_state(NR_PAGETABLE),
1594 global_page_state(NR_BOUNCE));
1595 1595
1596 for_each_zone(zone) { 1596 for_each_zone(zone) {
1597 int i; 1597 int i;