aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/mm
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2007-05-06 17:50:09 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-07 15:12:56 -0400
commitafa37394d6bfc91907b0e08c902d36d848232b99 (patch)
tree6b43da63c023f441a5f22bd1d767989aabb193cd /arch/ia64/mm
parent5a8130f2b186ac91190d1dcea875d66d08e6a1de (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/mm')
-rw-r--r--arch/ia64/mm/hugetlbpage.c8
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
148 return -ENOMEM; 148 return -ENOMEM;
149 if (len & ~HPAGE_MASK) 149 if (len & ~HPAGE_MASK)
150 return -EINVAL; 150 return -EINVAL;
151
152 /* Handle MAP_FIXED */
153 if (flags & MAP_FIXED) {
154 if (prepare_hugepage_range(addr, len, pgoff))
155 return -EINVAL;
156 return addr;
157 }
158
151 /* This code assumes that RGN_HPAGE != 0. */ 159 /* This code assumes that RGN_HPAGE != 0. */
152 if ((REGION_NUMBER(addr) != RGN_HPAGE) || (addr & (HPAGE_SIZE - 1))) 160 if ((REGION_NUMBER(addr) != RGN_HPAGE) || (addr & (HPAGE_SIZE - 1)))
153 addr = HPAGE_REGION_BASE; 161 addr = HPAGE_REGION_BASE;