diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2007-05-06 17:50:06 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-07 15:12:56 -0400 |
commit | 4b87b3b2eb1fa2d6ac0a1400ad5fb8f4b7cbfc09 (patch) | |
tree | c9e9a0b2e5074294f4b3b20d34c57c6fa028a1ae | |
parent | d506a7725114aaddbf982fd18621b3e0e5c27f1b (diff) |
get_unmapped_area handles MAP_FIXED on alpha
Handle MAP_FIXED in alpha's arch_get_unmapped_area(), simple case, just return
the address as passed in
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | arch/alpha/kernel/osf_sys.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c index be133f1f75a4..67ae41dcb6fa 100644 --- a/arch/alpha/kernel/osf_sys.c +++ b/arch/alpha/kernel/osf_sys.c | |||
@@ -1267,6 +1267,9 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr, | |||
1267 | if (len > limit) | 1267 | if (len > limit) |
1268 | return -ENOMEM; | 1268 | return -ENOMEM; |
1269 | 1269 | ||
1270 | if (flags & MAP_FIXED) | ||
1271 | return addr; | ||
1272 | |||
1270 | /* First, see if the given suggestion fits. | 1273 | /* First, see if the given suggestion fits. |
1271 | 1274 | ||
1272 | The OSF/1 loader (/sbin/loader) relies on us returning an | 1275 | The OSF/1 loader (/sbin/loader) relies on us returning an |