---

yaml --- r: 54231 b: refs/heads/master c: 2fd3beb h: refs/heads/master i: 54229: 0be82d9 54227: 234a48a 54223: e1334e0 v: v3
git-mirror · May 7, 2007 · e7d46ae · e7d46ae
1 parent 87ee12e
commit e7d46ae
Show file tree

Hide file tree

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