From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751337AbdBCQv7 (ORCPT ); Fri, 3 Feb 2017 11:51:59 -0500 Received: from mout.kundenserver.de ([212.227.17.24]:61607 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751149AbdBCQv5 (ORCPT ); Fri, 3 Feb 2017 11:51:57 -0500 From: Arnd Bergmann To: Andrew Morton Cc: Arnd Bergmann , "Kirill A. Shutemov" , Hugh Dickins , Mike Rapoport , linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH] fixup! userfaultfd: non-cooperative: add event for memory unmaps Date: Fri, 3 Feb 2017 17:50:42 +0100 Message-Id: <20170203165141.3665284-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:2/+jBs2nDQiXyeVNsr1PLzvFyRVactZsYf7uM5yCjkRZloNiFUv v8qFXnZHJyZ8BRhgG93VqM6t3RtZhe3+XtEvIveQWrJflWiA48xeTxsFObyWV/cUk+l2VCX Q79l4w7fvPXa7HD4x/D51Bn5+PQqI4fwY3++fHdZwqdl8pJpINW+Fj5Mq5glpSiIXZGtdGb A7nhv6w+JtqPdYT71hTcQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:RT0rp+VDujI=:6K2s2Ge2WA4wT4U8YGqiqC NyLeXaeoBf9jB/ba5HAZeVVmJBfZ7AwHxPMJbD7Iqrpuy5dZWVnerbdbUPuL6HHOvKArXBIy1 1MBDsE8zRNvqPGCQi/3qDi09SjGrhkPYu3Xb2EIWgX9ZGLwds31dFMT57YH1cDoqdavrBrVtL uKAt1rjbW0UskeSNcXERrvqIBhYaCthKCp5rXCdGTSwVzWaIGdVLbumRvQ5JFJIR2zaJQTT1h p34l2yS6MFhK8nvkbVXLakQuVbeQlY77ezBeEjKSgqZz2M3jH/2cDe0C65p+BqD70fnGqyDVV /ttuHh9PceZckYuQOmMZ/+XVJAFxt4bWWCQicajfI7HFcIBCW4mVEb439XW+1vIGuosLVSnew 3VhmMSlmsDmFSMlfIaDtnNjXQckXrV4mbs+DSCs/5KZWt9P4ZAFbTFfeb9u9AUeZUKJMKLAKz KuuHEEeR7MiMLy18/q7JTjUKUodfkcOjmJL94XUlt0dZDElHtZs+Doq/ebssLtgXKyr43+ciq Um009PpUOu71ogVNs5EVBqfOTxr9MBYUYem27M1JRlN+r7IrTZnhBjTRRajuxDdKbopHC94aK axLDdnRfL4vOy0WgwlAtSqGyrHTfMNDJmwBTMn1eX5mH8nNhFY9kiw9aJbLwQvk6XwgMdM7SW A4zG4Ff48QfvWej1XKHwyHz5a6mZS7BxBqgb1372X2u2QvtJag89luLlxBNV5JUrum28= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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") Signed-off-by: Arnd Bergmann --- ipc/shm.c | 2 +- mm/nommu.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ipc/shm.c b/ipc/shm.c index 175158d6fb13..3a178ca12bb9 100644 --- a/ipc/shm.c +++ b/ipc/shm.c @@ -1370,7 +1370,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; } diff --git a/mm/nommu.c b/mm/nommu.c index 215c62296028..fe9f4fa4a7a7 100644 --- a/mm/nommu.c +++ b/mm/nommu.c @@ -1205,7 +1205,8 @@ unsigned long do_mmap(struct file *file, unsigned long flags, vm_flags_t vm_flags, unsigned long pgoff, - unsigned long *populate) + unsigned long *populate, + struct list_head *uf) { struct vm_area_struct *vma; struct vm_region *region; @@ -1577,7 +1578,7 @@ static int shrink_vma(struct mm_struct *mm, * - under NOMMU conditions the chunk to be unmapped must be backed by a single * VMA, though it need not cover the whole VMA */ -int do_munmap(struct mm_struct *mm, unsigned long start, size_t len) +int do_munmap(struct mm_struct *mm, unsigned long start, size_t len, struct list_head *uf) { struct vm_area_struct *vma; unsigned long end; @@ -1643,7 +1644,7 @@ int vm_munmap(unsigned long addr, size_t len) int ret; down_write(&mm->mmap_sem); - ret = do_munmap(mm, addr, len); + ret = do_munmap(mm, addr, len, NULL); up_write(&mm->mmap_sem); return ret; } -- 2.9.0