Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 1 insertions, 1 deletions

diff --git a/mm/percpu-vm.c b/mm/percpu-vm.c
index 7d9c1d0ebd3f..ea534960a04b 100644
--- a/mm/percpu-vm.c
+++ b/mm/percpu-vm.c
@@ -421,7 +421,7 @@ static struct pcpu_chunk *pcpu_create_chunk(void)
                 return NULL;
 
         vms = pcpu_get_vm_areas(pcpu_group_offsets, pcpu_group_sizes,
-                                pcpu_nr_groups, pcpu_atom_size, GFP_KERNEL);
+                                pcpu_nr_groups, pcpu_atom_size);
         if (!vms) {
                 pcpu_free_chunk(chunk);
                 return NULL;