Merge branch 'for-linus' of ssh://master.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[deliverable/linux.git] / mm / highmem.c

diff --git a/mm/highmem.c b/mm/highmem.c
index 0206e7e5018c8998c87349706fe1fcfb5644933c..51e1c1995fec1d87a1e8e80d4518008d4ec4f4f1 100644 (file)
--- a/mm/highmem.c
+++ b/mm/highmem.c
@@ -47,7 +47,8 @@ unsigned int nr_free_highpages (void)
        unsigned int pages = 0;
 
        for_each_online_pgdat(pgdat)
-               pages += pgdat->node_zones[ZONE_HIGHMEM].free_pages;
+               pages += zone_page_state(&pgdat->node_zones[ZONE_HIGHMEM],
+                       NR_FREE_PAGES);
 
        return pages;
 }