netlink: Replace rhash_portid with bound

[firefly-linux-kernel-4.4.55.git] / mm / nommu.c

diff --git a/mm/nommu.c b/mm/nommu.c
index 58ea3643b9e9968a723f498d7df55b34c51a179e..ab14a2014dea76b62e77b0176d810037e1c76788 100644 (file)
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -324,12 +324,12 @@ long vwrite(char *buf, char *addr, unsigned long count)
 }
 
 /*
- *     vmalloc  -  allocate virtually continguos memory
+ *     vmalloc  -  allocate virtually contiguous memory
  *
  *     @size:          allocation size
  *
  *     Allocate enough pages to cover @size from the page level
- *     allocator and map them into continguos kernel virtual space.
+ *     allocator and map them into contiguous kernel virtual space.
  *
  *     For tight control over page level allocator and protection flags
  *     use __vmalloc() instead.
@@ -341,12 +341,12 @@ void *vmalloc(unsigned long size)
 EXPORT_SYMBOL(vmalloc);
 
 /*
- *     vzalloc - allocate virtually continguos memory with zero fill
+ *     vzalloc - allocate virtually contiguous memory with zero fill
  *
  *     @size:          allocation size
  *
  *     Allocate enough pages to cover @size from the page level
- *     allocator and map them into continguos kernel virtual space.
+ *     allocator and map them into contiguous kernel virtual space.
  *     The memory allocated is set to zero.
  *
  *     For tight control over page level allocator and protection flags
@@ -420,7 +420,7 @@ void *vmalloc_exec(unsigned long size)
  *     @size:          allocation size
  *
  *     Allocate enough 32bit PA addressable pages to cover @size from the
- *     page level allocator and map them into continguos kernel virtual space.
+ *     page level allocator and map them into contiguous kernel virtual space.
  */
 void *vmalloc_32(unsigned long size)
 {
@@ -1035,7 +1035,7 @@ static int validate_mmap_request(struct file *file,
 
                /* handle executable mappings and implied executable
                 * mappings */
-               if (file->f_path.mnt->mnt_flags & MNT_NOEXEC) {
+               if (path_noexec(&file->f_path)) {
                        if (prot & PROT_EXEC)
                                return -EPERM;
                } else if ((prot & PROT_READ) && !(prot & PROT_EXEC)) {
@@ -1233,18 +1233,19 @@ enomem:
 /*
  * handle mapping creation for uClinux
  */
-unsigned long do_mmap_pgoff(struct file *file,
-                           unsigned long addr,
-                           unsigned long len,
-                           unsigned long prot,
-                           unsigned long flags,
-                           unsigned long pgoff,
-                           unsigned long *populate)
+unsigned long do_mmap(struct file *file,
+                       unsigned long addr,
+                       unsigned long len,
+                       unsigned long prot,
+                       unsigned long flags,
+                       vm_flags_t vm_flags,
+                       unsigned long pgoff,
+                       unsigned long *populate)
 {
        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;
@@ -1262,7 +1263,7 @@ unsigned long do_mmap_pgoff(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);