USB: xhci: don't start a halted endpoint before its new dequeue is set

[deliverable/linux.git] / mm / nommu.c

diff --git a/mm/nommu.c b/mm/nommu.c
index 4a852f6c5709dbda2a29561714b704972ec292f6..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);
 }
@@ -1981,11 +1981,6 @@ error:
        return -ENOMEM;
 }
 
-int in_gate_area_no_mm(unsigned long addr)
-{
-       return 0;
-}
-
 int filemap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
        BUG();