From f23f2073708d10a196a7300ea8323f99f7973a4e Mon Sep 17 00:00:00 2001
From: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Date: Sat, 3 Sep 2005 15:54:56 -0700
Subject: [PATCH] --- yaml --- r: 6871 b: refs/heads/master c:
 4944e76d81801b8e60ed3e7789443f210c16ed65 h: refs/heads/master i:   6869:
 98690c3bccda78d6cc68d5cf08c512c3143bca3d   6867:
 d04b29b1e1f5452ea04bee12cab761f36790cbe7   6863:
 08505f39af1322429b7abe95dcbd8411c1d9ca29 v: v3

---
 [refs]            | 2 +-
 trunk/mm/memory.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 91432e5f373c..bc9ef495e480 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d44ed4f86892e350f4b16a3489b7e7c1a9bb7ead
+refs/heads/master: 4944e76d81801b8e60ed3e7789443f210c16ed65
diff --git a/trunk/mm/memory.c b/trunk/mm/memory.c
index a596c1172248..b25f5e58a14c 100644
--- a/trunk/mm/memory.c
+++ b/trunk/mm/memory.c
@@ -1955,7 +1955,7 @@ static int do_file_page(struct mm_struct * mm, struct vm_area_struct * vma,
 	 * Fall back to the linear mapping if the fs does not support
 	 * ->populate:
 	 */
-	if (!vma->vm_ops || !vma->vm_ops->populate || 
+	if (!vma->vm_ops->populate ||
 			(write_access && !(vma->vm_flags & VM_SHARED))) {
 		pte_clear(mm, address, pte);
 		return do_no_page(mm, vma, address, write_access, pte, pmd);