From 3d2d61e3ec6e4edb540438b1ed58731ae56deda6 Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Sun, 6 May 2007 14:50:10 -0700
Subject: [PATCH] --- yaml --- r: 54235 b: refs/heads/master c:
 ac35ee484df361e1aed89873a458900693effdbe h: refs/heads/master i:   54233:
 bc7af9e652c91bc6fe1c357b2b98fa4cd2be2bfa   54231:
 e7d46aeac09353aaa576006a6ec1ae35d5f9fff5 v: v3

---
 [refs]                              | 2 +-
 trunk/arch/sparc64/mm/hugetlbpage.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 03c4ddfae007..6ad19bf02354 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 869e5101728fe2f307f0a3c3cf599c184f81f0ee
+refs/heads/master: ac35ee484df361e1aed89873a458900693effdbe
diff --git a/trunk/arch/sparc64/mm/hugetlbpage.c b/trunk/arch/sparc64/mm/hugetlbpage.c
index 00677b5e1d7d..e224a94e6a1b 100644
--- a/trunk/arch/sparc64/mm/hugetlbpage.c
+++ b/trunk/arch/sparc64/mm/hugetlbpage.c
@@ -175,6 +175,12 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
 	if (len > task_size)
 		return -ENOMEM;
 
+	if (flags & MAP_FIXED) {
+		if (prepare_hugepage_range(addr, len, pgoff))
+			return -EINVAL;
+		return addr;
+	}
+
 	if (addr) {
 		addr = ALIGN(addr, HPAGE_SIZE);
 		vma = find_vma(mm, addr);