From e7d46aeac09353aaa576006a6ec1ae35d5f9fff5 Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Sun, 6 May 2007 14:50:07 -0700
Subject: [PATCH] --- yaml --- r: 54231 b: refs/heads/master c:
 2fd3bebaad9da3b3b99c46a3389099424bf7ee35 h: refs/heads/master i:   54229:
 0be82d94b8ac60c83af01f9a97a62b3105330446   54227:
 234a48aef878621db1e06c63e0796058fb096812   54223:
 e1334e091bfc027c916927ed3908f05eac0e1941 v: v3

---
 [refs]                        | 2 +-
 trunk/arch/frv/mm/elf-fdpic.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

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);