| commit | e3fc629d7bb70848fbf479688a66d4e76dff46ac | [log] [tgz] |
|---|---|---|
| author | Al Viro <viro@zeniv.linux.org.uk> | Wed May 30 20:08:42 2012 -0400 |
| committer | Al Viro <viro@zeniv.linux.org.uk> | Fri Jun 01 10:37:17 2012 -0400 |
| tree | 96b6d5ffdb1c643fb28807a635e6ca4e24964034 | |
| parent | 98de59bfe4b2ff6344d9ad8e5296f80de5dcc5b6 [diff] [blame] |
switch aio and shm to do_mmap_pgoff(), make do_mmap() static after all, 0 bytes and 0 pages is the same thing... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
diff --git a/ipc/shm.c b/ipc/shm.c index e3a8063..5e2cbfd 100644 --- a/ipc/shm.c +++ b/ipc/shm.c
@@ -1054,7 +1054,7 @@ goto invalid; } - user_addr = do_mmap (file, addr, size, prot, flags, 0); + user_addr = do_mmap_pgoff(file, addr, size, prot, flags, 0); *raddr = user_addr; err = 0; if (IS_ERR_VALUE(user_addr))