diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-02-08 10:27:34 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-09 21:53:04 +1100 |
| commit | 2a942d796ec8573f88f3d7fd09045a2e9e03b244 (patch) | |
| tree | d9ce9f196042f9be84a3452b58d56e9bda478b09 /ipc | |
| parent | ed5c2a7c2b5e41da54ea375b88bb1987c947cde8 (diff) | |
userfaultfd-non-cooperative-add-event-for-memory-unmaps-fix-2
The prototypes for MMU-based machines and MMU-less builds have to be the
same, this fixes the build errors I saw:
mm/nommu.c:1201:15: error: conflicting types for 'do_mmap'
mm/nommu.c:1580:5: error: conflicting types for 'do_munmap'
Fixes: mmtom ("userfaultfd: non-cooperative: add event for memory unmaps")
Link: http://lkml.kernel.org/r/20170203165141.3665284-1-arnd@arndb.de
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'ipc')
| -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 cb95152e2806..d7805acb44fd 100644 --- a/ipc/shm.c +++ b/ipc/shm.c @@ -1365,7 +1365,7 @@ SYSCALL_DEFINE1(shmdt, char __user *, shmaddr) * given */ if (vma && vma->vm_start == addr && vma->vm_ops == &shm_vm_ops) { - do_munmap(mm, vma->vm_start, vma->vm_end - vma->vm_start); + do_munmap(mm, vma->vm_start, vma->vm_end - vma->vm_start, NULL); retval = 0; } |