aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2007-05-06 17:50:07 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-07 15:12:56 -0400
commit2fd3bebaad9da3b3b99c46a3389099424bf7ee35 (patch)
tree12bdfd3dd36af5d2630582753c0d7676fe2eceea
parentacec0ac0a87ca821f9d204780c2d1aa0509a6346 (diff)
get_unmapped_area handles MAP_FIXED on frv
Handle MAP_FIXED in arch_get_unmapped_area on frv. Trivial case, just return the address. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: David Howells <dhowells@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/frv/mm/elf-fdpic.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/frv/mm/elf-fdpic.c b/arch/frv/mm/elf-fdpic.c
index 9477ccce070e..cac2c01a3a56 100644
--- a/arch/frv/mm/elf-fdpic.c
+++ b/arch/frv/mm/elf-fdpic.c
@@ -64,6 +64,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
64 if (len > TASK_SIZE) 64 if (len > TASK_SIZE)
65 return -ENOMEM; 65 return -ENOMEM;
66 66
67 /* handle MAP_FIXED */
68 if (flags & MAP_FIXED)
69 return addr;
70
67 /* only honour a hint if we're not going to clobber something doing so */ 71 /* only honour a hint if we're not going to clobber something doing so */
68 if (addr) { 72 if (addr) {
69 addr = PAGE_ALIGN(addr); 73 addr = PAGE_ALIGN(addr);