diff options
Diffstat (limited to 'mm')
-rw-r--r-- | mm/memory.c | 2 | ||||
-rw-r--r-- | mm/mmap.c | 4 | ||||
-rw-r--r-- | mm/nommu.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/mm/memory.c b/mm/memory.c index ca0003947115..e2bbba42604c 100644 --- a/mm/memory.c +++ b/mm/memory.c | |||
@@ -681,7 +681,7 @@ static void print_bad_pte(struct vm_area_struct *vma, unsigned long addr, | |||
681 | if (vma->vm_ops) | 681 | if (vma->vm_ops) |
682 | printk(KERN_ALERT "vma->vm_ops->fault: %pSR\n", | 682 | printk(KERN_ALERT "vma->vm_ops->fault: %pSR\n", |
683 | vma->vm_ops->fault); | 683 | vma->vm_ops->fault); |
684 | if (vma->vm_file && vma->vm_file->f_op) | 684 | if (vma->vm_file) |
685 | printk(KERN_ALERT "vma->vm_file->f_op->mmap: %pSR\n", | 685 | printk(KERN_ALERT "vma->vm_file->f_op->mmap: %pSR\n", |
686 | vma->vm_file->f_op->mmap); | 686 | vma->vm_file->f_op->mmap); |
687 | dump_stack(); | 687 | dump_stack(); |
@@ -1299,7 +1299,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr, | |||
1299 | vm_flags &= ~VM_MAYEXEC; | 1299 | vm_flags &= ~VM_MAYEXEC; |
1300 | } | 1300 | } |
1301 | 1301 | ||
1302 | if (!file->f_op || !file->f_op->mmap) | 1302 | if (!file->f_op->mmap) |
1303 | return -ENODEV; | 1303 | return -ENODEV; |
1304 | if (vm_flags & (VM_GROWSDOWN|VM_GROWSUP)) | 1304 | if (vm_flags & (VM_GROWSDOWN|VM_GROWSUP)) |
1305 | return -EINVAL; | 1305 | return -EINVAL; |
@@ -1951,7 +1951,7 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len, | |||
1951 | return -ENOMEM; | 1951 | return -ENOMEM; |
1952 | 1952 | ||
1953 | get_area = current->mm->get_unmapped_area; | 1953 | get_area = current->mm->get_unmapped_area; |
1954 | if (file && file->f_op && file->f_op->get_unmapped_area) | 1954 | if (file && file->f_op->get_unmapped_area) |
1955 | get_area = file->f_op->get_unmapped_area; | 1955 | get_area = file->f_op->get_unmapped_area; |
1956 | addr = get_area(file, addr, len, pgoff, flags); | 1956 | addr = get_area(file, addr, len, pgoff, flags); |
1957 | if (IS_ERR_VALUE(addr)) | 1957 | if (IS_ERR_VALUE(addr)) |
diff --git a/mm/nommu.c b/mm/nommu.c index ecd1f158548e..9e6cb02cba64 100644 --- a/mm/nommu.c +++ b/mm/nommu.c | |||
@@ -937,7 +937,7 @@ static int validate_mmap_request(struct file *file, | |||
937 | struct address_space *mapping; | 937 | struct address_space *mapping; |
938 | 938 | ||
939 | /* files must support mmap */ | 939 | /* files must support mmap */ |
940 | if (!file->f_op || !file->f_op->mmap) | 940 | if (!file->f_op->mmap) |
941 | return -ENODEV; | 941 | return -ENODEV; |
942 | 942 | ||
943 | /* work out if what we've got could possibly be shared | 943 | /* work out if what we've got could possibly be shared |