---

yaml --- r: 54235 b: refs/heads/master c: ac35ee4 h: refs/heads/master i: 54233: bc7af9e 54231: e7d46ae v: v3
git-mirror · May 7, 2007 · 3d2d61e · 3d2d61e
1 parent 85c9f4c
commit 3d2d61e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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);