diff options
| author | Kirill A. Shutemov <kirill@shutemov.name> | 2015-08-25 14:31:59 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-09-09 12:11:54 +1000 |
| commit | 0629e3777af6a9c5a8309e279d12a16aa4b3f7b4 (patch) | |
| tree | 06152ca09333cf5bc092d7dfc4e76a77cfb6a857 /mm | |
| parent | 5d4732f7784aac777ff127939c70664cd61477c2 (diff) | |
mm-mpx-add-vm_flags_t-vm_flags-arg-to-do_mmap_pgoff-fix
mm/nommu.c: In function 'do_mmap':
>> mm/nommu.c:1248:30: error: 'vm_flags' redeclared as different kind of symbol
unsigned long capabilities, vm_flags, result;
^
mm/nommu.c:1241:15: note: previous definition of 'vm_flags' was here
vm_flags_t vm_flags,
Reported-by: Wu Fengguang <fengguang.wu@intel.com>
Reported-by: Oleg Nesterov <oleg@redhat.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Tested-by: Mark Salter <msalter@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/nommu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/nommu.c b/mm/nommu.c index f1035e29f0a7..d28173689f52 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); |