diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-05-31 02:08:42 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-06-01 16:37:17 +0200 |
| commit | e3fc629d7bb70848fbf479688a66d4e76dff46ac (patch) | |
| tree | 96b6d5ffdb1c643fb28807a635e6ca4e24964034 /ipc/shm.c | |
| parent | take calculation of final prot in security_mmap_file() into a helper (diff) | |
| download | linux-e3fc629d7bb70848fbf479688a66d4e76dff46ac.tar.xz linux-e3fc629d7bb70848fbf479688a66d4e76dff46ac.zip | |
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/shm.c')
| -rw-r--r-- | ipc/shm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ipc/shm.c b/ipc/shm.c index e3a8063b1768..5e2cbfdab6fc 100644 --- a/ipc/shm.c +++ b/ipc/shm.c @@ -1054,7 +1054,7 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr) 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)) |