[PATCH v8 04/14] mm: Add len and flags parameters to arch_get_mmap_end()

[Christophe Leroy]

Powerpc needs flags and len to make decision on arch_get_mmap_end().

So add them as parameters to arch_get_mmap_end().

Signed-off-by: Christophe Leroy <christophe.le...@csgroup.eu>
Cc: Steve Capper <steve.cap...@arm.com>
Cc: Catalin Marinas <catalin.mari...@arm.com>
Cc: Will Deacon <w...@kernel.org>
Acked-by: Catalin Marinas <catalin.mari...@arm.com>
---
 arch/arm64/include/asm/processor.h | 4 ++--
 mm/mmap.c                          | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/arm64/include/asm/processor.h 
b/arch/arm64/include/asm/processor.h
index 6f41b65f9962..9ceec2bf4b93 100644
--- a/arch/arm64/include/asm/processor.h
+++ b/arch/arm64/include/asm/processor.h
@@ -91,8 +91,8 @@
 #endif /* CONFIG_COMPAT */
 
 #ifndef CONFIG_ARM64_FORCE_52BIT
-#define arch_get_mmap_end(addr) ((addr > DEFAULT_MAP_WINDOW) ? TASK_SIZE :\
-                               DEFAULT_MAP_WINDOW)
+#define arch_get_mmap_end(addr, len, flags) \
+               (((addr) > DEFAULT_MAP_WINDOW) ? TASK_SIZE : DEFAULT_MAP_WINDOW)
 
 #define arch_get_mmap_base(addr, base) ((addr > DEFAULT_MAP_WINDOW) ? \
                                        base + TASK_SIZE - DEFAULT_MAP_WINDOW :\
diff --git a/mm/mmap.c b/mm/mmap.c
index e062a4462db5..18cd52620719 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -2120,7 +2120,7 @@ unsigned long vm_unmapped_area(struct 
vm_unmapped_area_info *info)
 }
 
 #ifndef arch_get_mmap_end
-#define arch_get_mmap_end(addr)        (TASK_SIZE)
+#define arch_get_mmap_end(addr, len, flags)    (TASK_SIZE)
 #endif
 
 #ifndef arch_get_mmap_base
@@ -2146,7 +2146,7 @@ generic_get_unmapped_area(struct file *filp, unsigned 
long addr,
        struct mm_struct *mm = current->mm;
        struct vm_area_struct *vma, *prev;
        struct vm_unmapped_area_info info;
-       const unsigned long mmap_end = arch_get_mmap_end(addr);
+       const unsigned long mmap_end = arch_get_mmap_end(addr, len, flags);
 
        if (len > mmap_end - mmap_min_addr)
                return -ENOMEM;
@@ -2194,7 +2194,7 @@ generic_get_unmapped_area_topdown(struct file *filp, 
unsigned long addr,
        struct vm_area_struct *vma, *prev;
        struct mm_struct *mm = current->mm;
        struct vm_unmapped_area_info info;
-       const unsigned long mmap_end = arch_get_mmap_end(addr);
+       const unsigned long mmap_end = arch_get_mmap_end(addr, len, flags);
 
        /* requested length too big for entire address space */
        if (len > mmap_end - mmap_min_addr)
-- 
2.34.1