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
         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;