2 files changed, 15 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
         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;
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;