diff --git a/[refs] b/[refs]
index 173ef16adbb0..f1ad457dec37 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2fd3bebaad9da3b3b99c46a3389099424bf7ee35
+refs/heads/master: 5a8130f2b186ac91190d1dcea875d66d08e6a1de
diff --git a/trunk/arch/i386/mm/hugetlbpage.c b/trunk/arch/i386/mm/hugetlbpage.c
index 34728e4afe48..6272a4fd9e7c 100644
--- a/trunk/arch/i386/mm/hugetlbpage.c
+++ b/trunk/arch/i386/mm/hugetlbpage.c
@@ -367,6 +367,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);