diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-05-30 20:08:42 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-06-01 10:37:17 -0400 |
commit | e3fc629d7bb70848fbf479688a66d4e76dff46ac (patch) | |
tree | 96b6d5ffdb1c643fb28807a635e6ca4e24964034 /ipc | |
parent | 98de59bfe4b2ff6344d9ad8e5296f80de5dcc5b6 (diff) |
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>
Diffstat (limited to 'ipc')
-rw-r--r-- | ipc/shm.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1054,7 +1054,7 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr) | |||
1054 | goto invalid; | 1054 | goto invalid; |
1055 | } | 1055 | } |
1056 | 1056 | ||
1057 | user_addr = do_mmap (file, addr, size, prot, flags, 0); | 1057 | user_addr = do_mmap_pgoff(file, addr, size, prot, flags, 0); |
1058 | *raddr = user_addr; | 1058 | *raddr = user_addr; |
1059 | err = 0; | 1059 | err = 0; |
1060 | if (IS_ERR_VALUE(user_addr)) | 1060 | if (IS_ERR_VALUE(user_addr)) |