diff --git a/[refs] b/[refs]
index 0a0fb9f3550d..173ef16adbb0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: acec0ac0a87ca821f9d204780c2d1aa0509a6346
+refs/heads/master: 2fd3bebaad9da3b3b99c46a3389099424bf7ee35
diff --git a/trunk/arch/frv/mm/elf-fdpic.c b/trunk/arch/frv/mm/elf-fdpic.c
index 9477ccce070e..cac2c01a3a56 100644
--- a/trunk/arch/frv/mm/elf-fdpic.c
+++ b/trunk/arch/frv/mm/elf-fdpic.c
@@ -64,6 +64,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
 	if (len > TASK_SIZE)
 		return -ENOMEM;
 
+	/* handle MAP_FIXED */
+	if (flags & MAP_FIXED)
+		return addr;
+
 	/* only honour a hint if we're not going to clobber something doing so */
 	if (addr) {
 		addr = PAGE_ALIGN(addr);