diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2007-05-06 17:50:09 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-07 15:12:56 -0400 |
commit | afa37394d6bfc91907b0e08c902d36d848232b99 (patch) | |
tree | 6b43da63c023f441a5f22bd1d767989aabb193cd /arch/ia64/kernel/sys_ia64.c | |
parent | 5a8130f2b186ac91190d1dcea875d66d08e6a1de (diff) |
get_unmapped_area handles MAP_FIXED on ia64
Handle MAP_FIXED in ia64 arch_get_unmapped_area and
hugetlb_get_unmapped_area(), just call prepare_hugepage_range in the later and
is_hugepage_only_range() in the former.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: William Irwin <bill.irwin@oracle.com>
Cc: "Luck, Tony" <tony.luck@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/ia64/kernel/sys_ia64.c')
-rw-r--r-- | arch/ia64/kernel/sys_ia64.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c index 9ef62a3fbfad..2fcaa2051aa3 100644 --- a/arch/ia64/kernel/sys_ia64.c +++ b/arch/ia64/kernel/sys_ia64.c | |||
@@ -33,6 +33,13 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len | |||
33 | if (len > RGN_MAP_LIMIT) | 33 | if (len > RGN_MAP_LIMIT) |
34 | return -ENOMEM; | 34 | return -ENOMEM; |
35 | 35 | ||
36 | /* handle fixed mapping: prevent overlap with huge pages */ | ||
37 | if (flags & MAP_FIXED) { | ||
38 | if (is_hugepage_only_range(mm, addr, len)) | ||
39 | return -EINVAL; | ||
40 | return addr; | ||
41 | } | ||
42 | |||
36 | #ifdef CONFIG_HUGETLB_PAGE | 43 | #ifdef CONFIG_HUGETLB_PAGE |
37 | if (REGION_NUMBER(addr) == RGN_HPAGE) | 44 | if (REGION_NUMBER(addr) == RGN_HPAGE) |
38 | addr = 0; | 45 | addr = 0; |