aboutsummaryrefslogtreecommitdiffstats
path: root/ipc/shm.c
diff options
context:
space:
mode:
Diffstat (limited to 'ipc/shm.c')
-rw-r--r--ipc/shm.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/ipc/shm.c b/ipc/shm.c
index 7f6537b84ef5..d7805acb44fd 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -1222,7 +1222,7 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
1222 goto invalid; 1222 goto invalid;
1223 } 1223 }
1224 1224
1225 addr = do_mmap_pgoff(file, addr, size, prot, flags, 0, &populate); 1225 addr = do_mmap_pgoff(file, addr, size, prot, flags, 0, &populate, NULL);
1226 *raddr = addr; 1226 *raddr = addr;
1227 err = 0; 1227 err = 0;
1228 if (IS_ERR_VALUE(addr)) 1228 if (IS_ERR_VALUE(addr))
@@ -1329,7 +1329,7 @@ SYSCALL_DEFINE1(shmdt, char __user *, shmaddr)
1329 */ 1329 */
1330 file = vma->vm_file; 1330 file = vma->vm_file;
1331 size = i_size_read(file_inode(vma->vm_file)); 1331 size = i_size_read(file_inode(vma->vm_file));
1332 do_munmap(mm, vma->vm_start, vma->vm_end - vma->vm_start); 1332 do_munmap(mm, vma->vm_start, vma->vm_end - vma->vm_start, NULL);
1333 /* 1333 /*
1334 * We discovered the size of the shm segment, so 1334 * We discovered the size of the shm segment, so
1335 * break out of here and fall through to the next 1335 * break out of here and fall through to the next
@@ -1356,7 +1356,7 @@ SYSCALL_DEFINE1(shmdt, char __user *, shmaddr)
1356 if ((vma->vm_ops == &shm_vm_ops) && 1356 if ((vma->vm_ops == &shm_vm_ops) &&
1357 ((vma->vm_start - addr)/PAGE_SIZE == vma->vm_pgoff) && 1357 ((vma->vm_start - addr)/PAGE_SIZE == vma->vm_pgoff) &&
1358 (vma->vm_file == file)) 1358 (vma->vm_file == file))
1359 do_munmap(mm, vma->vm_start, vma->vm_end - vma->vm_start); 1359 do_munmap(mm, vma->vm_start, vma->vm_end - vma->vm_start, NULL);
1360 vma = next; 1360 vma = next;
1361 } 1361 }
1362 1362
@@ -1365,7 +1365,7 @@ SYSCALL_DEFINE1(shmdt, char __user *, shmaddr)
1365 * given 1365 * given
1366 */ 1366 */
1367 if (vma && vma->vm_start == addr && vma->vm_ops == &shm_vm_ops) { 1367 if (vma && vma->vm_start == addr && vma->vm_ops == &shm_vm_ops) {
1368 do_munmap(mm, vma->vm_start, vma->vm_end - vma->vm_start); 1368 do_munmap(mm, vma->vm_start, vma->vm_end - vma->vm_start, NULL);
1369 retval = 0; 1369 retval = 0;
1370 } 1370 }
1371 1371