The patch titled Subject: c-r-prctl-add-pr_set_mm-codes-to-set-up-mm_struct-entries-fix has been removed from the -mm tree. Its filename was c-r-prctl-add-pr_set_mm-codes-to-set-up-mm_struct-entries-fix.patch This patch was dropped because it was folded into c-r-prctl-add-pr_set_mm-codes-to-set-up-mm_struct-entries.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: c-r-prctl-add-pr_set_mm-codes-to-set-up-mm_struct-entries-fix cache current->mm in a local, saving 200 bytes text Cc: Andrew Vagin <avagin@xxxxxxxxxx> Cc: Cyrill Gorcunov <gorcunov@xxxxxxxxxx> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx> Cc: Kees Cook <keescook@xxxxxxxxxxxx> Cc: Michael Kerrisk <mtk.manpages@xxxxxxxxx> Cc: Pavel Emelyanov <xemul@xxxxxxxxxxxxx> Cc: Serge Hallyn <serge.hallyn@xxxxxxxxxxxxx> Cc: Tejun Heo <tj@xxxxxxxxxx> Cc: Vasiliy Kulikov <segoon@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- kernel/sys.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff -puN kernel/sys.c~c-r-prctl-add-pr_set_mm-codes-to-set-up-mm_struct-entries-fix kernel/sys.c --- a/kernel/sys.c~c-r-prctl-add-pr_set_mm-codes-to-set-up-mm_struct-entries-fix +++ a/kernel/sys.c @@ -1701,6 +1701,7 @@ static int prctl_set_mm(int opt, unsigne unsigned long vm_bad_flags; struct vm_area_struct *vma; int error = 0; + struct mm_struct *mm = current->mm; if (arg4 | arg5) return -EINVAL; @@ -1711,8 +1712,8 @@ static int prctl_set_mm(int opt, unsigne if (addr >= TASK_SIZE) return -EINVAL; - down_read(¤t->mm->mmap_sem); - vma = find_vma(current->mm, addr); + down_read(&mm->mmap_sem); + vma = find_vma(mm, addr); if (opt != PR_SET_MM_START_BRK && opt != PR_SET_MM_BRK) { /* It must be existing VMA */ @@ -1732,9 +1733,9 @@ static int prctl_set_mm(int opt, unsigne goto out; if (opt == PR_SET_MM_START_CODE) - current->mm->start_code = addr; + mm->start_code = addr; else - current->mm->end_code = addr; + mm->end_code = addr; break; case PR_SET_MM_START_DATA: @@ -1747,9 +1748,9 @@ static int prctl_set_mm(int opt, unsigne goto out; if (opt == PR_SET_MM_START_DATA) - current->mm->start_data = addr; + mm->start_data = addr; else - current->mm->end_data = addr; + mm->end_data = addr; break; case PR_SET_MM_START_STACK: @@ -1762,31 +1763,31 @@ static int prctl_set_mm(int opt, unsigne if ((vma->vm_flags & vm_req_flags) != vm_req_flags) goto out; - current->mm->start_stack = addr; + mm->start_stack = addr; break; case PR_SET_MM_START_BRK: - if (addr <= current->mm->end_data) + if (addr <= mm->end_data) goto out; if (rlim < RLIM_INFINITY && - (current->mm->brk - addr) + - (current->mm->end_data - current->mm->start_data) > rlim) + (mm->brk - addr) + + (mm->end_data - mm->start_data) > rlim) goto out; - current->mm->start_brk = addr; + mm->start_brk = addr; break; case PR_SET_MM_BRK: - if (addr <= current->mm->end_data) + if (addr <= mm->end_data) goto out; if (rlim < RLIM_INFINITY && - (addr - current->mm->start_brk) + - (current->mm->end_data - current->mm->start_data) > rlim) + (addr - mm->start_brk) + + (mm->end_data - mm->start_data) > rlim) goto out; - current->mm->brk = addr; + mm->brk = addr; break; default: @@ -1797,7 +1798,7 @@ static int prctl_set_mm(int opt, unsigne error = 0; out: - up_read(¤t->mm->mmap_sem); + up_read(&mm->mmap_sem); return error; } _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch treewide-convert-uses-of-attrib_noreturn-to-__noreturn.patch drivers-video-nvidia-nvidiac-fix-warning.patch pipe-fail-cleanly-when-root-tries-f_setpipe_sz-with-big-size.patch mm-vmscan-distinguish-between-memcg-triggering-reclaim-and-memcg-being-scanned.patch memcg-make-mem_cgroup_split_huge_fixup-more-efficient.patch memcg-clear-pc-mem_cgorup-if-necessary.patch memcg-simplify-lru-handling-by-new-rule.patch mm-compaction-introduce-sync-light-migration-for-use-by-compaction.patch mm-vmallocc-eliminate-extra-loop-in-pcpu_get_vm_areas-error-path.patch kexec-remove-kmsg_dump_kexec.patch panic-dont-print-redundant-backtraces-on-oops.patch drivers-parport-parport_pcc-fix-warnings.patch dio-optimize-cache-misses-in-the-submission-path-v2.patch selftests-new-very-basic-kernel-selftests-directory.patch c-r-prctl-add-pr_set_mm-codes-to-set-up-mm_struct-entries.patch fixed-use-of-rounddown_pow_of_two-in-ramoops.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html