From 58cb42994881a05741f4e0e0b18c5f29fb445c50 Mon Sep 17 00:00:00 2001 From: Christoph Lameter Date: Mon, 14 Jan 2008 00:55:14 -0800 Subject: [PATCH] --- yaml --- r: 75447 b: refs/heads/master c: 96990a4ae979df9e235d01097d6175759331e88c h: refs/heads/master i: 75445: b535b03cbf8d55b480466b0173c6ef89b3cb31d5 75443: ae1996a02f7c6f39880c888a04357a5635105de8 75439: 54da3fa0dbad4bb314af35b9f201d000ddd72867 v: v3 --- [refs] | 2 +- trunk/mm/quicklist.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4da687fa27c3..9b840bec58d4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8f4c79ce79d1552014af3c115d03e13092443905 +refs/heads/master: 96990a4ae979df9e235d01097d6175759331e88c diff --git a/trunk/mm/quicklist.c b/trunk/mm/quicklist.c index ae8189c2799e..3f703f7cb398 100644 --- a/trunk/mm/quicklist.c +++ b/trunk/mm/quicklist.c @@ -26,9 +26,17 @@ DEFINE_PER_CPU(struct quicklist, quicklist)[CONFIG_NR_QUICK]; static unsigned long max_pages(unsigned long min_pages) { unsigned long node_free_pages, max; + struct zone *zones = NODE_DATA(numa_node_id())->node_zones; + + 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; return max(max, min_pages); }