percpu: allow select gfp to be passed to underlying allocators

[linux-2.6-block.git] / mm / percpu-vm.c

diff --git a/mm/percpu-vm.c b/mm/percpu-vm.c
index 0af71eb2fff0392efb7b06dc778f34ec9e82a137..d8078de912de38a15626771fea1b25c5b3baf0a6 100644 (file)
--- a/mm/percpu-vm.c
+++ b/mm/percpu-vm.c
@@ -37,7 +37,7 @@ static struct page **pcpu_get_pages(void)
        lockdep_assert_held(&pcpu_alloc_mutex);
 
        if (!pages)
-               pages = pcpu_mem_zalloc(pages_size, 0);
+               pages = pcpu_mem_zalloc(pages_size, GFP_KERNEL);
        return pages;
 }
 
@@ -86,7 +86,7 @@ static int pcpu_alloc_pages(struct pcpu_chunk *chunk,
        unsigned int cpu, tcpu;
        int i;
 
-       gfp |= GFP_KERNEL | __GFP_HIGHMEM;
+       gfp |= __GFP_HIGHMEM;
 
        for_each_possible_cpu(cpu) {
                for (i = page_start; i < page_end; i++) {