From adac3aadb95d1e761a44f1096ba4f2b2ddd5ce71 Mon Sep 17 00:00:00 2001
From: James Hogan <james.hogan@imgtec.com>
Date: Mon, 11 Feb 2013 17:28:10 +0000
Subject: [PATCH] --- yaml --- r: 360675 b: refs/heads/master c:
 f75c28d896f4dd0064e60bba1e82a4c98908d239 h: refs/heads/master i:   360673:
 7fce08c6e91180e0008a093cd0cb0c958ad1e25a   360671:
 cef124ee26217c3d9dd43b13327b15ae9ee3d0f2 v: v3

---
 [refs]                            |  2 +-
 trunk/arch/metag/mm/hugetlbpage.c | 52 ++++++-------------------------
 2 files changed, 11 insertions(+), 43 deletions(-)

diff --git a/[refs] b/[refs]
index 6b6d3af3c978..5cfc4a9387c5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c838e72a35e49ea51c39c2c634ece028fa49c565
+refs/heads/master: f75c28d896f4dd0064e60bba1e82a4c98908d239
diff --git a/trunk/arch/metag/mm/hugetlbpage.c b/trunk/arch/metag/mm/hugetlbpage.c
index 24ceed4f4eed..3c52fa6d0f8e 100644
--- a/trunk/arch/metag/mm/hugetlbpage.c
+++ b/trunk/arch/metag/mm/hugetlbpage.c
@@ -192,43 +192,15 @@ hugetlb_get_unmapped_area_existing(unsigned long len)
 static unsigned long
 hugetlb_get_unmapped_area_new_pmd(unsigned long len)
 {
-	struct mm_struct *mm = current->mm;
-	struct vm_area_struct *vma;
-	unsigned long start_addr, addr;
-
-	if (ALIGN_HUGEPT(len) > mm->cached_hole_size)
-		start_addr = mm->free_area_cache;
-	else
-		start_addr = TASK_UNMAPPED_BASE;
-
-new_search:
-	addr = ALIGN_HUGEPT(start_addr);
-
-	for (vma = find_vma(mm, addr); ; vma = vma->vm_next) {
-		if (TASK_SIZE - len < addr) {
-			/*
-			 * Start a new search - just in case we missed
-			 * some holes.
-			 */
-			if (start_addr != TASK_UNMAPPED_BASE) {
-				start_addr = TASK_UNMAPPED_BASE;
-				mm->cached_hole_size = 0;
-				goto new_search;
-			}
-			return 0;
-		}
-		/* skip ahead if we've aligned right over some vmas */
-		if (vma && vma->vm_end <= addr)
-			continue;
-		if (!vma || ALIGN_HUGEPT(addr + len) <= vma->vm_start) {
-#if HPAGE_SHIFT < HUGEPT_SHIFT
-			if (len & HUGEPT_MASK)
-				mm->context.part_huge = addr + len;
-#endif
-			return addr;
-		}
-		addr = ALIGN_HUGEPT(vma->vm_end);
-	}
+	struct vm_unmapped_area_info info;
+
+	info.flags = 0;
+	info.length = len;
+	info.low_limit = TASK_UNMAPPED_BASE;
+	info.high_limit = TASK_SIZE;
+	info.align_mask = PAGE_MASK & HUGEPT_MASK;
+	info.align_offset = 0;
+	return vm_unmapped_area(&info);
 }
 
 unsigned long
@@ -266,11 +238,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
 	 * Find an unmapped naturally aligned set of 4MB blocks that we can use
 	 * for huge pages.
 	 */
-	addr = hugetlb_get_unmapped_area_new_pmd(len);
-	if (likely(addr))
-		return addr;
-
-	return -EINVAL;
+	return hugetlb_get_unmapped_area_new_pmd(len);
 }
 
 #endif /*HAVE_ARCH_HUGETLB_UNMAPPED_AREA*/