Merge tag 'stable/for-linus-3.18-rc0-tag' of git://git.kernel.org/pub/scm/linux/kerne...

[karo-tx-linux.git] / mm / nommu.c

diff --git a/mm/nommu.c b/mm/nommu.c
index a881d9673c6b165e5336e83bf2ab75bf3c03d938..bd1808e194a7f36a2e1cc418c51ea85dffc713fc 100644 (file)
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -539,7 +539,7 @@ void __init mmap_init(void)
 {
        int ret;
 
-       ret = percpu_counter_init(&vm_committed_as, 0);
+       ret = percpu_counter_init(&vm_committed_as, 0, GFP_KERNEL);
        VM_BUG_ON(ret);
        vm_region_jar = KMEM_CACHE(vm_region, SLAB_PANIC);
 }