From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753763AbbG0Ok1 (ORCPT ); Mon, 27 Jul 2015 10:40:27 -0400 Received: from bh-25.webhostbox.net ([208.91.199.152]:56213 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753189AbbG0OkZ (ORCPT ); Mon, 27 Jul 2015 10:40:25 -0400 From: Guenter Roeck To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Guenter Roeck , Dave Hansen , "Kirill A. Shutemov" , Oleg Nesterov Subject: [PATCH -next] mm: Fix build for nommu systems Date: Mon, 27 Jul 2015 07:40:17 -0700 Message-Id: <1438008017-14692-1-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 2.1.0 X-Authenticated_sender: guenter@roeck-us.net X-OutGoing-Spam-Status: No, score=-1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - bh-25.webhostbox.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - roeck-us.net X-Get-Message-Sender-Via: bh-25.webhostbox.net: authenticated_id: guenter@roeck-us.net X-Source: X-Source-Args: X-Source-Dir: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit 31705a3a633b ("mm, mpx: add vm_flags_t vm_flags arg to do_mmap_pgoff()") added vm_flags as parameter to do_mmap_pgoff(). The resulting code for nommu systems no longer compiles. The fix matches the mmu code changes. Fixes: 31705a3a633b ("mm, mpx: add vm_flags_t vm_flags arg to do_mmap_pgoff()") Cc: Dave Hansen Cc: Kirill A. Shutemov Cc: Andrew Morton Cc: Oleg Nesterov Signed-off-by: Guenter Roeck --- mm/nommu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/nommu.c b/mm/nommu.c index 530eea5af989..af2196e35013 100644 --- a/mm/nommu.c +++ b/mm/nommu.c @@ -1245,7 +1245,7 @@ unsigned long do_mmap(struct file *file, struct vm_area_struct *vma; struct vm_region *region; struct rb_node *rb; - unsigned long capabilities, vm_flags, result; + unsigned long capabilities, result; int ret; *populate = 0; @@ -1263,7 +1263,7 @@ unsigned long do_mmap(struct file *file, /* we've determined that we can make the mapping, now translate what we * now know into VMA flags */ - vm_flags = determine_vm_flags(file, prot, flags, capabilities); + vm_flags |= determine_vm_flags(file, prot, flags, capabilities); /* we're going to need to record the mapping */ region = kmem_cache_zalloc(vm_region_jar, GFP_KERNEL); -- 2.1.0