The patch titled
Subject: mm-mlock-check-against-vma-for-actual-mlock-size-fix
has been removed from the -mm tree. Its filename was
mm-mlock-check-against-vma-for-actual-mlock-size-fix.patch
This patch was dropped because it was folded into mm-mlock-check-against-vma-for-actual-mlock-size.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mm-mlock-check-against-vma-for-actual-mlock-size-fix
clean up comment layout
Cc: Simon Guo <wei.guo.simon@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/mlock.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff -puN mm/mlock.c~mm-mlock-check-against-vma-for-actual-mlock-size-fix mm/mlock.c
--- a/mm/mlock.c~mm-mlock-check-against-vma-for-actual-mlock-size-fix
+++ a/mm/mlock.c
@@ -678,12 +678,10 @@ static __must_check int do_mlock(unsigne
locked += current->mm->locked_vm;
if ((locked > lock_limit) && (!capable(CAP_IPC_LOCK))) {
/*
- * It is possible that the regions requested
- * intersect with previously mlocked areas,
- * that part area in "mm->locked_vm" should
- * not be counted to new mlock increment
- * count. So check and adjust locked count
- * if necessary.
+ * It is possible that the regions requested intersect with
+ * previously mlocked areas, that part area in "mm->locked_vm"
+ * should not be counted to new mlock increment count. So check
+ * and adjust locked count if necessary.
*/
locked -= count_mm_mlocked_page_nr(current->mm,
start, len);
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
mm-mlock-check-against-vma-for-actual-mlock-size.patch
mm-page_ioc-replace-some-bug_ons-with-vm_bug_on_page.patch
mm-memcontrol-consolidate-cgroup-socket-tracking-checkpatch-fixes.patch
mmksm-add-__gfp_high-to-the-allocation-in-alloc_stable_node-v2-fix.patch
seq-proc-modify-seq_put_decimal_ll-to-take-a-const-char-not-char-fix.patch
a.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
