From e3528d2e42e72ce955a2c4c543c29814e803e012 Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Sun, 6 May 2007 14:50:14 -0700
Subject: [PATCH] --- yaml --- r: 54239 b: refs/heads/master c:
 4b1d89290b62bb2db476c94c82cf7442aab440c8 h: refs/heads/master i:   54237:
 b8bede1c9622af17c0e9358452ca132c11adcc9f   54235:
 3d2d61e3ec6e4edb540438b1ed58731ae56deda6   54231:
 e7d46aeac09353aaa576006a6ec1ae35d5f9fff5   54223:
 e1334e091bfc027c916927ed3908f05eac0e1941   54207:
 738a4eb50d4265824913c52b921f0ffea29273f0 v: v3

---
 [refs]          |  2 +-
 trunk/mm/mmap.c | 16 ----------------
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index a4cbd04256ec..27600c122338 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 06abdfb47ee745a4d79721de24260815ec6bca2b
+refs/heads/master: 4b1d89290b62bb2db476c94c82cf7442aab440c8
diff --git a/trunk/mm/mmap.c b/trunk/mm/mmap.c
index a6b7c796352b..52646d61ff69 100644
--- a/trunk/mm/mmap.c
+++ b/trunk/mm/mmap.c
@@ -1382,22 +1382,6 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
 	if (addr & ~PAGE_MASK)
 		return -EINVAL;
 
-	if (file && is_file_hugepages(file))  {
-		/*
-		 * Check if the given range is hugepage aligned, and
-		 * can be made suitable for hugepages.
-		 */
-		ret = prepare_hugepage_range(addr, len, pgoff);
-	} else {
-		/*
-		 * Ensure that a normal request is not falling in a
-		 * reserved hugepage range.  For some archs like IA-64,
-		 * there is a separate region for hugepages.
-		 */
-		ret = is_hugepage_only_range(current->mm, addr, len);
-	}
-	if (ret)
-		return -EINVAL;
 	return addr;
 }