Merge branch 'akpm' (patches from Andrew Morton)

[~andy/linux] / mm / memory.c

diff --git a/mm/memory.c b/mm/memory.c
index 15744b2cf919528f7ca813997ceaf34295c584d8..bf8665849a5fed0b93f6022670c7c571e7eea8c6 100644 (file)
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -679,7 +679,7 @@ static void print_bad_pte(struct vm_area_struct *vma, unsigned long addr,
        if (vma->vm_ops)
                printk(KERN_ALERT "vma->vm_ops->fault: %pSR\n",
                       vma->vm_ops->fault);
-       if (vma->vm_file && vma->vm_file->f_op)
+       if (vma->vm_file)
                printk(KERN_ALERT "vma->vm_file->f_op->mmap: %pSR\n",
                       vma->vm_file->f_op->mmap);
        dump_stack();