Merge branch 'master' into devel and apply fixup from Stephen Rothwell:

[firefly-linux-kernel-4.4.55.git] / mm / madvise.c

diff --git a/mm/madvise.c b/mm/madvise.c
index 2221491ed5038dcdcbe3c19bc65172eeb4380a75..74bf193eff04fdeea6c433675a3705adbeb3c0f1 100644 (file)
--- a/mm/madvise.c
+++ b/mm/madvise.c
@@ -218,7 +218,7 @@ static long madvise_remove(struct vm_area_struct *vma,
        endoff = (loff_t)(end - vma->vm_start - 1)
                        + ((loff_t)vma->vm_pgoff << PAGE_SHIFT);
 
-       /* vmtruncate_range needs to take i_mutex and i_alloc_sem */
+       /* vmtruncate_range needs to take i_mutex */
        up_read(&current->mm->mmap_sem);
        error = vmtruncate_range(mapping->host, offset, endoff);
        down_read(&current->mm->mmap_sem);