+ userfaultfd-non-cooperative-add-event-for-memory-unmaps-fix-2.patch added to -mm tree

+ userfaultfd-non-cooperative-add-event-for-memory-unmaps-fix-2.patch added to -mm tree

[akpm]

The patch titled
     Subject: userfaultfd-non-cooperative-add-event-for-memory-unmaps-fix-2
has been added to the -mm tree.  Its filename is
     userfaultfd-non-cooperative-add-event-for-memory-unmaps-fix-2.patch

This patch should soon appear at
    http://ozlabs.org/~akpm/mmots/broken-out/userfaultfd-non-cooperative-add-event-for-memory-unmaps-fix-2.patch
and later at
    http://ozlabs.org/~akpm/mmotm/broken-out/userfaultfd-non-cooperative-add-event-for-memory-unmaps-fix-2.patch

Before you just go and hit "reply", please:
   a) Consider who else should be cc'ed
   b) Prefer to cc a suitable mailing list as well
   c) Ideally: find the original patch on the mailing list and do a
      reply-to-all to that, adding suitable additional cc's

*** Remember to use Documentation/SubmitChecklist when testing your code ***

The -mm tree is included into linux-next and is updated
there every 3-4 working days

------------------------------------------------------
From: Arnd Bergmann <arnd@arndb.de>
Subject: 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>
---

 ipc/shm.c  |    2 +-
 mm/nommu.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff -puN ipc/shm.c~userfaultfd-non-cooperative-add-event-for-memory-unmaps-fix-2 ipc/shm.c
--- a/ipc/shm.c~userfaultfd-non-cooperative-add-event-for-memory-unmaps-fix-2
+++ a/ipc/shm.c
@@ -1365,7 +1365,7 @@ SYSCALL_DEFINE1(shmdt, char __user *, sh
 	 * 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;
 	}
 
diff -puN mm/nommu.c~userfaultfd-non-cooperative-add-event-for-memory-unmaps-fix-2 mm/nommu.c
--- a/mm/nommu.c~userfaultfd-non-cooperative-add-event-for-memory-unmaps-fix-2
+++ a/mm/nommu.c
@@ -1206,7 +1206,7 @@ unsigned long do_mmap(struct file *file,
 			vm_flags_t vm_flags,
 			unsigned long pgoff,
 			unsigned long *populate,
-			struct list_head *uf_unused)
+			struct list_head *uf)
 {
 	struct vm_area_struct *vma;
 	struct vm_region *region;
_

Patches currently in -mm which might be from arnd@arndb.de are

mm-track-active-portions-of-a-section-at-boot-fix-fix.patch
mm-support-section-unaligned-zone_device-memory-ranges-fix.patch
mm-fs-reduce-fault-page_mkwrite-and-pfn_mkwrite-to-take-only-vmf-fix.patch
userfaultfd-non-cooperative-add-event-for-memory-unmaps-fix-2.patch
lib-add-config_test_sort-to-enable-self-test-of-sort-fix.patch