Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

[platform/kernel/linux-starfive.git] / ipc / shm.c

diff --git a/ipc/shm.c b/ipc/shm.c
index bd2fcc4..60e45e7 100644 (file)
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -1786,8 +1786,8 @@ long ksys_shmdt(char __user *shmaddr)
                         */
                        file = vma->vm_file;
                        size = i_size_read(file_inode(vma->vm_file));
-                       do_munmap(mm, vma->vm_start, vma->vm_end - vma->vm_start, NULL);
-                       mas_pause(&vmi.mas);
+                       do_vma_munmap(&vmi, vma, vma->vm_start, vma->vm_end,
+                                     NULL, false);
                        /*
                         * We discovered the size of the shm segment, so
                         * break out of here and fall through to the next
@@ -1811,8 +1811,8 @@ long ksys_shmdt(char __user *shmaddr)
                if ((vma->vm_ops == &shm_vm_ops) &&
                    ((vma->vm_start - addr)/PAGE_SIZE == vma->vm_pgoff) &&
                    (vma->vm_file == file)) {
-                       do_munmap(mm, vma->vm_start, vma->vm_end - vma->vm_start, NULL);
-                       mas_pause(&vmi.mas);
+                       do_vma_munmap(&vmi, vma, vma->vm_start, vma->vm_end,
+                                     NULL, false);
                }
 
                vma = vma_next(&vmi);