mm-mlock-check-against-vma-for-actual-mlock-size-fix

clean up comment layout

Cc: Simon Guo <wei.guo.simon@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/mm/mlock.c b/mm/mlock.c
index 92831870ab3c0a98aec28d509236f9c7941242ab..e144f75a9e59653a8c41d745c2dacffd3aabe4d8 100644 (file)
--- a/mm/mlock.c
+++ b/mm/mlock.c
@@ -678,12 +678,10 @@ static __must_check int do_mlock(unsigned long start, size_t len, vm_flags_t fla
        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);