Commit:     96990a4ae979df9e235d01097d6175759331e88c
Parent:     8f4c79ce79d1552014af3c115d03e13092443905
Author:     Christoph Lameter <[EMAIL PROTECTED]>
AuthorDate: Mon Jan 14 00:55:14 2008 -0800
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Mon Jan 14 08:52:22 2008 -0800

    quicklists: Only consider memory that can be used with GFP_KERNEL
    Quicklists calculates the size of the quicklists based on the number of
    free pages.  This must be the number of free pages that can be allocated
    with GFP_KERNEL.  node_page_state() includes the pages in ZONE_HIGHMEM and
    ZONE_MOVABLE which may lead the quicklists to become too large causing OOM.
    Signed-off-by: Christoph Lameter <[EMAIL PROTECTED]>
    Tested-by: Dhaval Giani <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 mm/quicklist.c |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/mm/quicklist.c b/mm/quicklist.c
index ae8189c..3f703f7 100644
--- a/mm/quicklist.c
+++ b/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 =
+               zone_page_state(&zones[ZONE_DMA], NR_FREE_PAGES) +
+               zone_page_state(&zones[ZONE_DMA32], NR_FREE_PAGES) +
+               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);
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to