From b7f8a7f07643ac0c27c8a601f991f3d64131a5c7 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Mon, 5 Mar 2012 13:35:49 -0500
Subject: [PATCH] --- yaml --- r: 292313 b: refs/heads/master c:
 8b2a12382ccc9df31b27dac37fe04dffe088b57c h: refs/heads/master i:   292311:
 b4f5a9f4377662de40a1217260cbb86cb235fb40 v: v3

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

diff --git a/[refs] b/[refs]
index a47e23452e3e..88295f902d69 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 038c7aa16a38059ac23dfe9caa6954226ea20728
+refs/heads/master: 8b2a12382ccc9df31b27dac37fe04dffe088b57c
diff --git a/trunk/mm/memory.c b/trunk/mm/memory.c
index 1b6712a9720d..f2317c85704e 100644
--- a/trunk/mm/memory.c
+++ b/trunk/mm/memory.c
@@ -1354,7 +1354,7 @@ unsigned long unmap_vmas(struct mmu_gather *tlb,
 		if (unlikely(is_pfn_mapping(vma)))
 			untrack_pfn_vma(vma, 0, 0);
 
-		while (start != end) {
+		if (start != end) {
 			if (unlikely(is_vm_hugetlb_page(vma))) {
 				/*
 				 * It is undesirable to test vma->vm_file as it
@@ -1371,8 +1371,8 @@ unsigned long unmap_vmas(struct mmu_gather *tlb,
 					unmap_hugepage_range(vma, start, end, NULL);
 			} else
 				unmap_page_range(tlb, vma, start, end, details);
-			start = end;
 		}
+		start = end;
 	}
 
 	mmu_notifier_invalidate_range_end(mm, start_addr, end_addr);