* [PATCH -next] mm: Fix build for nommu systems
@ 2015-07-27 14:40 Guenter Roeck
0 siblings, 0 replies; only message in thread
From: Guenter Roeck @ 2015-07-27 14:40 UTC (permalink / raw)
To: Andrew Morton
Cc: linux-mm, linux-kernel, Guenter Roeck, Dave Hansen,
Kirill A. Shutemov, Oleg Nesterov
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 <dave.hansen@linux.intel.com>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
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
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2015-07-27 14:40 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-07-27 14:40 [PATCH -next] mm: Fix build for nommu systems Guenter Roeck
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).