1 files changed, 11 insertions, 17 deletions

diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
index 8ecbb4bba4b3..f6679a7fb8ca 100644
--- a/arch/x86/mm/hugetlbpage.c
+++ b/arch/x86/mm/hugetlbpage.c
@@ -308,10 +308,11 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
 {
         struct hstate *h = hstate_file(file);
         struct mm_struct *mm = current->mm;
-        struct vm_area_struct *vma, *prev_vma;
-        unsigned long base = mm->mmap_base, addr = addr0;
+        struct vm_area_struct *vma;
+        unsigned long base = mm->mmap_base;
+        unsigned long addr = addr0;
         unsigned long largest_hole = mm->cached_hole_size;
-        int first_time = 1;
+        unsigned long start_addr;
 
         /* don't allow allocations above current base */
         if (mm->free_area_cache > base)
@@ -322,6 +323,8 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
                 mm->free_area_cache  = base;
         }
 try_again:
+        start_addr = mm->free_area_cache;
+
         /* make sure it can fit in the remaining address space */
         if (mm->free_area_cache < len)
                 goto fail;
@@ -337,22 +340,14 @@ try_again:
                 if (!vma)
                         return addr;
 
-                /*
-                 * new region fits between prev_vma->vm_end and
-                 * vma->vm_start, use it:
-                 */
-                prev_vma = vma->vm_prev;
-                if (addr + len <= vma->vm_start &&
-                            (!prev_vma || (addr >= prev_vma->vm_end))) {
+                if (addr + len <= vma->vm_start) {
                         /* remember the address as a hint for next time */
                         mm->cached_hole_size = largest_hole;
                         return (mm->free_area_cache = addr);
-                } else {
+                } else if (mm->free_area_cache == vma->vm_end) {
                         /* pull free_area_cache down to the first hole */
-                        if (mm->free_area_cache == vma->vm_end) {
-                                mm->free_area_cache = vma->vm_start;
-                                mm->cached_hole_size = largest_hole;
-                        }
+                        mm->free_area_cache = vma->vm_start;
+                        mm->cached_hole_size = largest_hole;
                 }
 
                 /* remember the largest hole we saw so far */
@@ -368,10 +363,9 @@ fail:
          * if hint left us with no space for the requested
          * mapping then try again:
          */
-        if (first_time) {
+        if (start_addr != base) {
                 mm->free_area_cache = base;
                 largest_hole = 0;
-                first_time = 0;
                 goto try_again;
         }
         /*