diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2007-05-06 23:50:09 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-07 21:12:56 +0200 |
| commit | afa37394d6bfc91907b0e08c902d36d848232b99 (patch) | |
| tree | 6b43da63c023f441a5f22bd1d767989aabb193cd /arch/ia64/mm/hugetlbpage.c | |
| parent | get_unmapped_area handles MAP_FIXED on i386 (diff) | |
| download | linux-afa37394d6bfc91907b0e08c902d36d848232b99.tar.xz linux-afa37394d6bfc91907b0e08c902d36d848232b99.zip | |
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/mm/hugetlbpage.c')
| -rw-r--r-- | arch/ia64/mm/hugetlbpage.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c index 0c7e94edc20e..c7c90f4f4298 100644 --- a/arch/ia64/mm/hugetlbpage.c +++ b/arch/ia64/mm/hugetlbpage.c @@ -148,6 +148,14 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u return -ENOMEM; if (len & ~HPAGE_MASK) return -EINVAL; + + /* Handle MAP_FIXED */ + if (flags & MAP_FIXED) { + if (prepare_hugepage_range(addr, len, pgoff)) + return -EINVAL; + return addr; + } + /* This code assumes that RGN_HPAGE != 0. */ if ((REGION_NUMBER(addr) != RGN_HPAGE) || (addr & (HPAGE_SIZE - 1))) addr = HPAGE_REGION_BASE; |