projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[cascardo/linux.git]
/
arch
/
frv
/
mm
/
elf-fdpic.c
diff --git
a/arch/frv/mm/elf-fdpic.c
b/arch/frv/mm/elf-fdpic.c
index
9477ccc
..
cac2c01
100644
(file)
--- 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
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);