rtlwifi: Create _rtl_dbg_trace function to reduce RT_TRACE code size

[cascardo/linux.git] / fs / exec.c

diff --git a/fs/exec.c b/fs/exec.c
index e92419f..887c1c9 100644 (file)
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -243,10 +243,6 @@ static void put_arg_page(struct page *page)
        put_page(page);
 }
 
-static void free_arg_page(struct linux_binprm *bprm, int i)
-{
-}
-
 static void free_arg_pages(struct linux_binprm *bprm)
 {
 }
@@ -267,7 +263,10 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
        if (!vma)
                return -ENOMEM;
 
-       down_write(&mm->mmap_sem);
+       if (down_write_killable(&mm->mmap_sem)) {
+               err = -EINTR;
+               goto err_free;
+       }
        vma->vm_mm = mm;
 
        /*
@@ -294,6 +293,7 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
        return 0;
 err:
        up_write(&mm->mmap_sem);
+err_free:
        bprm->vma = NULL;
        kmem_cache_free(vm_area_cachep, vma);
        return err;
@@ -700,7 +700,9 @@ int setup_arg_pages(struct linux_binprm *bprm,
                bprm->loader -= stack_shift;
        bprm->exec -= stack_shift;
 
-       down_write(&mm->mmap_sem);
+       if (down_write_killable(&mm->mmap_sem))
+               return -EINTR;
+
        vm_flags = VM_STACK_FLAGS;
 
        /*
@@ -1499,9 +1501,6 @@ int remove_arg_zero(struct linux_binprm *bprm)
 
                kunmap_atomic(kaddr);
                put_arg_page(page);
-
-               if (offset == PAGE_SIZE)
-                       free_arg_page(bprm, (bprm->p >> PAGE_SHIFT) - 1);
        } while (offset == PAGE_SIZE);
 
        bprm->p++;