From e442be22b65d59cc210e6f4b031b39aae745a7a9 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Mon, 14 Dec 2009 17:58:39 -0800 Subject: [PATCH] --- yaml --- r: 176253 b: refs/heads/master c: 976d6dfbb0175d136fc098854bbce0c028a3924b h: refs/heads/master i: 176251: 06237d0f0263e05d663b6fa831303c6b41d37c00 v: v3 --- [refs] | 2 +- trunk/mm/vmalloc.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 8b10a6800a12..225d466672fb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bad44b5be84cf3bb1ff900bec02ee61e1993328c +refs/heads/master: 976d6dfbb0175d136fc098854bbce0c028a3924b diff --git a/trunk/mm/vmalloc.c b/trunk/mm/vmalloc.c index 9b08d790df6f..37e69295f250 100644 --- a/trunk/mm/vmalloc.c +++ b/trunk/mm/vmalloc.c @@ -1411,6 +1411,7 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask, { struct page **pages; unsigned int nr_pages, array_size, i; + gfp_t nested_gfp = (gfp_mask & GFP_RECLAIM_MASK) | __GFP_ZERO; nr_pages = (area->size - PAGE_SIZE) >> PAGE_SHIFT; array_size = (nr_pages * sizeof(struct page *)); @@ -1418,13 +1419,11 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask, area->nr_pages = nr_pages; /* Please note that the recursion is strictly bounded. */ if (array_size > PAGE_SIZE) { - pages = __vmalloc_node(array_size, 1, gfp_mask | __GFP_ZERO, + pages = __vmalloc_node(array_size, 1, nested_gfp|__GFP_HIGHMEM, PAGE_KERNEL, node, caller); area->flags |= VM_VPAGES; } else { - pages = kmalloc_node(array_size, - (gfp_mask & GFP_RECLAIM_MASK) | __GFP_ZERO, - node); + pages = kmalloc_node(array_size, nested_gfp, node); } area->pages = pages; area->caller = caller;