Sync mach-omap2/irq.c with mainline

[linux-2.6-omap-h63xx.git] / mm / quicklist.c

diff --git a/mm/quicklist.c b/mm/quicklist.c
index ae8189c2799e99d936c01b76330b607593980a73..8dbb6805ef35a91af20a8aeb7090090e044d86e9 100644 (file)
--- a/mm/quicklist.c
+++ b/mm/quicklist.c
@@ -26,10 +26,25 @@ DEFINE_PER_CPU(struct quicklist, quicklist)[CONFIG_NR_QUICK];
 static unsigned long max_pages(unsigned long min_pages)
 {
        unsigned long node_free_pages, max;
+       int node = numa_node_id();
+       struct zone *zones = NODE_DATA(node)->node_zones;
+       int num_cpus_on_node;
+       node_to_cpumask_ptr(cpumask_on_node, node);
+
+       node_free_pages =
+#ifdef CONFIG_ZONE_DMA
+               zone_page_state(&zones[ZONE_DMA], NR_FREE_PAGES) +
+#endif
+#ifdef CONFIG_ZONE_DMA32
+               zone_page_state(&zones[ZONE_DMA32], NR_FREE_PAGES) +
+#endif
+               zone_page_state(&zones[ZONE_NORMAL], NR_FREE_PAGES);
 
-       node_free_pages = node_page_state(numa_node_id(),
-                       NR_FREE_PAGES);
        max = node_free_pages / FRACTION_OF_NODE_MEM;
+
+       num_cpus_on_node = cpus_weight_nr(*cpumask_on_node);
+       max /= num_cpus_on_node;
+
        return max(max, min_pages);
 }