diff --git a/[refs] b/[refs] index 3bcdeb58beac..a913f57330ce 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 74d46d6b2d23d44d72c37df4c6a5d2e782f7b088 +refs/heads/master: 142d44b0dd6741a64a7bdbe029110e7c1dcf1d23 diff --git a/trunk/mm/percpu.c b/trunk/mm/percpu.c index e0be1146f617..5fe37842e0ea 100644 --- a/trunk/mm/percpu.c +++ b/trunk/mm/percpu.c @@ -749,7 +749,7 @@ static struct pcpu_chunk *alloc_pcpu_chunk(void) chunk->map[chunk->map_used++] = pcpu_unit_size; chunk->page = chunk->page_ar; - chunk->vm = get_vm_area(pcpu_chunk_size, GFP_KERNEL); + chunk->vm = get_vm_area(pcpu_chunk_size, VM_ALLOC); if (!chunk->vm) { free_pcpu_chunk(chunk); return NULL;