From mboxrd@z Thu Jan 1 00:00:00 1970 From: Benjamin Herrenschmidt Date: Wed, 04 Apr 2007 14:01:29 +1000 Subject: [PATCH 6/14] get_unmapped_area handles MAP_FIXED on ia64 In-Reply-To: <1175659285.929428.835270667964.qpush@grosgo> Message-Id: <20070404040140.33683DDE47@ozlabs.org> Sender: owner-linux-mm@kvack.org Return-Path: To: Andrew Morton Cc: linux-arch@vger.kernel.org, Linux Memory Management , linux-kernel@vger.kernel.org List-ID: --- arch/ia64/kernel/sys_ia64.c | 7 +++++++ arch/ia64/mm/hugetlbpage.c | 8 ++++++++ 2 files changed, 15 insertions(+) Index: linux-cell/arch/ia64/kernel/sys_ia64.c =================================================================== --- linux-cell.orig/arch/ia64/kernel/sys_ia64.c 2007-03-22 15:10:45.000000000 +1100 +++ linux-cell/arch/ia64/kernel/sys_ia64.c 2007-03-22 15:10:47.000000000 +1100 @@ -33,6 +33,13 @@ arch_get_unmapped_area (struct file *fil if (len > RGN_MAP_LIMIT) return -ENOMEM; + /* handle fixed mapping: prevent overlap with huge pages */ + if (flags & MAP_FIXED) { + if (is_hugepage_only_range(mm, addr, len)) + return -EINVAL; + return addr; + } + #ifdef CONFIG_HUGETLB_PAGE if (REGION_NUMBER(addr) == RGN_HPAGE) addr = 0; Index: linux-cell/arch/ia64/mm/hugetlbpage.c =================================================================== --- linux-cell.orig/arch/ia64/mm/hugetlbpage.c 2007-03-22 15:12:32.000000000 +1100 +++ linux-cell/arch/ia64/mm/hugetlbpage.c 2007-03-22 15:12:39.000000000 +1100 @@ -148,6 +148,14 @@ unsigned long hugetlb_get_unmapped_area( 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; -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org