mm: make arch_get_unmapped_area() take vm_flags by default

Patch series "mm: Care about shadow stack guard gap when getting an
unmapped area", v2.

As covered in the commit log for c44357c2e76b ("x86/mm: care about shadow
stack guard gap during placement") our current mmap() implementation does
not take care to ensure that a new mapping isn't placed with existing
mappings inside it's own guard gaps.  This is particularly important for
shadow stacks since if two shadow stacks end up getting placed adjacent to
each other then they can overflow into each other which weakens the
protection offered by the feature.

On x86 there is a custom arch_get_unmapped_area() which was updated by the
above commit to cover this case by specifying a start_gap for allocations
with VM_SHADOW_STACK.  Both arm64 and RISC-V have equivalent features and
use the generic implementation of arch_get_unmapped_area() so let's make
the equivalent change there so they also don't get shadow stack pages
placed without guard pages.  The arm64 and RISC-V shadow stack
implementations are currently on the list:

   https://lore.kernel.org/r/20240829-arm64-gcs-v12-0-42fec94743
   https://lore.kernel.org/lkml/20240403234054.2020347-1-debug@rivosinc.com/

Given the addition of the use of vm_flags in the generic implementation we
also simplify the set of possibilities that have to be dealt with in the
core code by making arch_get_unmapped_area() take vm_flags as standard.
This is a bit invasive since the prototype change touches quite a few
architectures but since the parameter is ignored the change is
straightforward, the simplification for the generic code seems worth it.

This patch (of 3):

When we introduced arch_get_unmapped_area_vmflags() in 961148704acd ("mm:
introduce arch_get_unmapped_area_vmflags()") we did so as part of properly
supporting guard pages for shadow stacks on x86_64, which uses a custom
arch_get_unmapped_area().  Equivalent features are also present on both
arm64 and RISC-V, both of which use the generic implementation of
arch_get_unmapped_area() and will require equivalent modification there.
Rather than continue to deal with having two versions of the functions
let's bite the bullet and have all implementations of
arch_get_unmapped_area() take vm_flags as a parameter.

The new parameter is currently ignored by all implementations other than
x86.  The only caller that doesn't have a vm_flags available is
mm_get_unmapped_area(), as for the x86 implementation and the wrapper used
on other architectures this is modified to supply no flags.

No functional changes.

Link: https://lkml.kernel.org/r/20240904-mm-generic-shadow-stack-guard-v2-0-a46b8b6dc0ed@kernel.org
Link: https://lkml.kernel.org/r/20240904-mm-generic-shadow-stack-guard-v2-1-a46b8b6dc0ed@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
Acked-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
Reviewed-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
Acked-by: Helge Deller <deller@gmx.de>	[parisc]
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Andreas Larsson <andreas@gaisler.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Christian Borntraeger <borntraeger@linux.ibm.com>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Chris Zankel <chris@zankel.net>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: "Edgecombe, Rick P" <rick.p.edgecombe@intel.com>
Cc: Gerald Schaefer <gerald.schaefer@linux.ibm.com>
Cc: Guo Ren <guoren@kernel.org>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Cc: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Naveen N Rao <naveen@kernel.org>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Richard Henderson <richard.henderson@linaro.org>
Cc: Rich Felker <dalias@libc.org>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Sven Schnelle <svens@linux.ibm.com>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Vineet Gupta <vgupta@kernel.org>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: WANG Xuerui <kernel@xen0n.name>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
index e5f881bc82881caddbfba80c985595dcdc814b28..8886ab539273d236a92a73b741acd846d6cd7b8a 100644 (file)
--- a/arch/alpha/kernel/osf_sys.c
+++ b/arch/alpha/kernel/osf_sys.c
@@ -1229,7 +1229,7 @@ arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
 unsigned long
 arch_get_unmapped_area(struct file *filp, unsigned long addr,
                       unsigned long len, unsigned long pgoff,
-                      unsigned long flags)
+                      unsigned long flags, vm_flags_t vm_flags)
 {
        unsigned long limit;
 

diff --git a/arch/arc/mm/mmap.c b/arch/arc/mm/mmap.c
index 69a91529715599f08eec09089d32914e25e13bff..2185afe8d59f7a3ca078794caf8e4aa70f3eb986 100644 (file)
--- a/arch/arc/mm/mmap.c
+++ b/arch/arc/mm/mmap.c
@@ -23,7 +23,8 @@
  */
 unsigned long
 arch_get_unmapped_area(struct file *filp, unsigned long addr,
-               unsigned long len, unsigned long pgoff, unsigned long flags)
+               unsigned long len, unsigned long pgoff,
+               unsigned long flags, vm_flags_t vm_flags)
 {
        struct mm_struct *mm = current->mm;
        struct vm_area_struct *vma;

diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c
index d65d0e6ed10ab4beedcc240d82e90b730dfcfef9..3dbb383c26d5434866afc6ac7ed1badc721c8b74 100644 (file)
--- a/arch/arm/mm/mmap.c
+++ b/arch/arm/mm/mmap.c
@@ -28,7 +28,8 @@
  */
 unsigned long
 arch_get_unmapped_area(struct file *filp, unsigned long addr,
-               unsigned long len, unsigned long pgoff, unsigned long flags)
+               unsigned long len, unsigned long pgoff,
+               unsigned long flags, vm_flags_t vm_flags)
 {
        struct mm_struct *mm = current->mm;
        struct vm_area_struct *vma;
@@ -78,8 +79,8 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
 
 unsigned long
 arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
-                       const unsigned long len, const unsigned long pgoff,
-                       const unsigned long flags)
+                       const unsigned long len, const unsigned long pgoff,
+                       const unsigned long flags, vm_flags_t vm_flags)
 {
        struct vm_area_struct *vma;
        struct mm_struct *mm = current->mm;

diff --git a/arch/csky/abiv1/mmap.c b/arch/csky/abiv1/mmap.c
index 7f826331d409b2042a34e44033335fe7c4269d1f..1047865e82a903d85449a10cafcf11b44b45e428 100644 (file)
--- a/arch/csky/abiv1/mmap.c
+++ b/arch/csky/abiv1/mmap.c
@@ -23,7 +23,8 @@
  */
 unsigned long
 arch_get_unmapped_area(struct file *filp, unsigned long addr,
-               unsigned long len, unsigned long pgoff, unsigned long flags)
+               unsigned long len, unsigned long pgoff,
+               unsigned long flags, vm_flags_t vm_flags)
 {
        struct mm_struct *mm = current->mm;
        struct vm_area_struct *vma;

diff --git a/arch/loongarch/mm/mmap.c b/arch/loongarch/mm/mmap.c
index 8890309851351cddff798777982b53046e998160..914e82ff3f65632b61fea78ba7c874c1522eb910 100644 (file)
--- a/arch/loongarch/mm/mmap.c
+++ b/arch/loongarch/mm/mmap.c
@@ -89,7 +89,8 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
 }
 
 unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr0,
-       unsigned long len, unsigned long pgoff, unsigned long flags)
+       unsigned long len, unsigned long pgoff, unsigned long flags,
+       vm_flags_t vm_flags)
 {
        return arch_get_unmapped_area_common(filp,
                        addr0, len, pgoff, flags, UP);
@@ -101,7 +102,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr0,
  */
 unsigned long arch_get_unmapped_area_topdown(struct file *filp,
        unsigned long addr0, unsigned long len, unsigned long pgoff,
-       unsigned long flags)
+       unsigned long flags, vm_flags_t vm_flags)
 {
        return arch_get_unmapped_area_common(filp,
                        addr0, len, pgoff, flags, DOWN);

diff --git a/arch/mips/mm/mmap.c b/arch/mips/mm/mmap.c
index 7e11d7b58761075ef837a13e8c50ba7f57422c8a..5d2a1225785b8134832fc94b668b36b204556981 100644 (file)
--- a/arch/mips/mm/mmap.c
+++ b/arch/mips/mm/mmap.c
@@ -98,7 +98,8 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
 }
 
 unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr0,
-       unsigned long len, unsigned long pgoff, unsigned long flags)
+       unsigned long len, unsigned long pgoff, unsigned long flags,
+       vm_flags_t vm_flags)
 {
        return arch_get_unmapped_area_common(filp,
                        addr0, len, pgoff, flags, UP);
@@ -110,7 +111,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr0,
  */
 unsigned long arch_get_unmapped_area_topdown(struct file *filp,
        unsigned long addr0, unsigned long len, unsigned long pgoff,
-       unsigned long flags)
+       unsigned long flags, vm_flags_t vm_flags)
 {
        return arch_get_unmapped_area_common(filp,
                        addr0, len, pgoff, flags, DOWN);

diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c
index f7722451276ef4f88c1cb1b7b692597e8bf90d7d..f852fe274abe46f041b94ecaadedc9e88f0acd6c 100644 (file)
--- a/arch/parisc/kernel/sys_parisc.c
+++ b/arch/parisc/kernel/sys_parisc.c
@@ -167,7 +167,8 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
 }
 
 unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
-       unsigned long len, unsigned long pgoff, unsigned long flags)
+       unsigned long len, unsigned long pgoff, unsigned long flags,
+       vm_flags_t vm_flags)
 {
        return arch_get_unmapped_area_common(filp,
                        addr, len, pgoff, flags, UP);
@@ -175,7 +176,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
 
 unsigned long arch_get_unmapped_area_topdown(struct file *filp,
        unsigned long addr, unsigned long len, unsigned long pgoff,
-       unsigned long flags)
+       unsigned long flags, vm_flags_t vm_flags)
 {
        return arch_get_unmapped_area_common(filp,
                        addr, len, pgoff, flags, DOWN);

diff --git a/arch/parisc/mm/hugetlbpage.c b/arch/parisc/mm/hugetlbpage.c
index 0356199bd9e7e76fb01062c79acf6986994941eb..aa664f7ddb63986cdc0ad61ad7b4a0457f919e41 100644 (file)
--- a/arch/parisc/mm/hugetlbpage.c
+++ b/arch/parisc/mm/hugetlbpage.c
@@ -40,7 +40,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
                addr = ALIGN(addr, huge_page_size(h));
 
        /* we need to make sure the colouring is OK */
-       return arch_get_unmapped_area(file, addr, len, pgoff, flags);
+       return arch_get_unmapped_area(file, addr, len, pgoff, flags, 0);
 }
 
 

diff --git a/arch/powerpc/mm/book3s64/slice.c b/arch/powerpc/mm/book3s64/slice.c
index ef3ce37f1bb3ece583c1f99980095d59a509f5e6..ada6bf896ef81e457bc29309fba9dc1d1192dee2 100644 (file)
--- a/arch/powerpc/mm/book3s64/slice.c
+++ b/arch/powerpc/mm/book3s64/slice.c
@@ -637,7 +637,8 @@ unsigned long arch_get_unmapped_area(struct file *filp,
                                     unsigned long addr,
                                     unsigned long len,
                                     unsigned long pgoff,
-                                    unsigned long flags)
+                                    unsigned long flags,
+                                    vm_flags_t vm_flags)
 {
        if (radix_enabled())
                return generic_get_unmapped_area(filp, addr, len, pgoff, flags);
@@ -650,7 +651,8 @@ unsigned long arch_get_unmapped_area_topdown(struct file *filp,
                                             const unsigned long addr0,
                                             const unsigned long len,
                                             const unsigned long pgoff,
-                                            const unsigned long flags)
+                                            const unsigned long flags,
+                                            vm_flags_t vm_flags)
 {
        if (radix_enabled())
                return generic_get_unmapped_area_topdown(filp, addr0, len, pgoff, flags);

diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c
index 2067569465897b364530fe589f6d1a52c9d37916..96efa061ce01ba9ed650ac7a45e956b24527da8d 100644 (file)
--- a/arch/s390/mm/mmap.c
+++ b/arch/s390/mm/mmap.c
@@ -82,7 +82,7 @@ static int get_align_mask(struct file *filp, unsigned long flags)
 
 unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
                                     unsigned long len, unsigned long pgoff,
-                                    unsigned long flags)
+                                    unsigned long flags, vm_flags_t vm_flags)
 {
        struct mm_struct *mm = current->mm;
        struct vm_area_struct *vma;
@@ -117,7 +117,7 @@ check_asce_limit:
 
 unsigned long arch_get_unmapped_area_topdown(struct file *filp, unsigned long addr,
                                             unsigned long len, unsigned long pgoff,
-                                            unsigned long flags)
+                                            unsigned long flags, vm_flags_t vm_flags)
 {
        struct vm_area_struct *vma;
        struct mm_struct *mm = current->mm;

diff --git a/arch/sh/mm/mmap.c b/arch/sh/mm/mmap.c
index bee329d4149aa7e7a48a02448310ce38d4d59f33..c442734d9b0ca34923988be5f29ffbdf019cbf5b 100644 (file)
--- a/arch/sh/mm/mmap.c
+++ b/arch/sh/mm/mmap.c
@@ -52,7 +52,8 @@ static inline unsigned long COLOUR_ALIGN(unsigned long addr,
 }
 
 unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
-       unsigned long len, unsigned long pgoff, unsigned long flags)
+       unsigned long len, unsigned long pgoff, unsigned long flags,
+       vm_flags_t vm_flags)
 {
        struct mm_struct *mm = current->mm;
        struct vm_area_struct *vma;
@@ -99,7 +100,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
 unsigned long
 arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
                          const unsigned long len, const unsigned long pgoff,
-                         const unsigned long flags)
+                         const unsigned long flags, vm_flags_t vm_flags)
 {
        struct vm_area_struct *vma;
        struct mm_struct *mm = current->mm;

diff --git a/arch/sparc/kernel/sys_sparc_32.c b/arch/sparc/kernel/sys_sparc_32.c
index 08a19727795ca4a6ae85943787554b48f9f2ae82..80822f922e767158359ad8a434932d10de673c3c 100644 (file)
--- a/arch/sparc/kernel/sys_sparc_32.c
+++ b/arch/sparc/kernel/sys_sparc_32.c
@@ -39,7 +39,7 @@ SYSCALL_DEFINE0(getpagesize)
        return PAGE_SIZE; /* Possibly older binaries want 8192 on sun4's? */
 }
 
-unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsigned long len, unsigned long pgoff, unsigned long flags)
+unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsigned long len, unsigned long pgoff, unsigned long flags, vm_flags_t vm_flags)
 {
        struct vm_unmapped_area_info info = {};
 

diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c
index d9c3b34ca7447075cb735603ee3324f297ff9845..acade309dc2fbdac75afd68073e8e330be6a2e50 100644 (file)
--- a/arch/sparc/kernel/sys_sparc_64.c
+++ b/arch/sparc/kernel/sys_sparc_64.c
@@ -87,7 +87,7 @@ static inline unsigned long COLOR_ALIGN(unsigned long addr,
        return base + off;
 }
 
-unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsigned long len, unsigned long pgoff, unsigned long flags)
+unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsigned long len, unsigned long pgoff, unsigned long flags, vm_flags_t vm_flags)
 {
        struct mm_struct *mm = current->mm;
        struct vm_area_struct * vma;
@@ -146,7 +146,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
 unsigned long
 arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
                          const unsigned long len, const unsigned long pgoff,
-                         const unsigned long flags)
+                         const unsigned long flags, vm_flags_t vm_flags)
 {
        struct vm_area_struct *vma;
        struct mm_struct *mm = current->mm;

diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
index 3c4407271d083869ee98b484513dbdbcca8ae808..7e9db77231ac7f596182b2f259c2798fbaf20f30 100644 (file)
--- a/arch/x86/include/asm/pgtable_64.h
+++ b/arch/x86/include/asm/pgtable_64.h
@@ -245,7 +245,6 @@ extern void cleanup_highmap(void);
 
 #define HAVE_ARCH_UNMAPPED_AREA
 #define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN
-#define HAVE_ARCH_UNMAPPED_AREA_VMFLAGS
 
 #define PAGE_AGP    PAGE_KERNEL_NOCACHE
 #define HAVE_PAGE_AGP 1

diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
index 01d7cd85ef9789d5742ca7e9f7dc7f2f11063fd7..87f8c9a71c496430a552e0e0bdc9495cbbe99614 100644 (file)
--- a/arch/x86/kernel/sys_x86_64.c
+++ b/arch/x86/kernel/sys_x86_64.c
@@ -121,7 +121,7 @@ static inline unsigned long stack_guard_placement(vm_flags_t vm_flags)
 }
 
 unsigned long
-arch_get_unmapped_area_vmflags(struct file *filp, unsigned long addr, unsigned long len,
+arch_get_unmapped_area(struct file *filp, unsigned long addr, unsigned long len,
                       unsigned long pgoff, unsigned long flags, vm_flags_t vm_flags)
 {
        struct mm_struct *mm = current->mm;
@@ -158,7 +158,7 @@ arch_get_unmapped_area_vmflags(struct file *filp, unsigned long addr, unsigned l
 }
 
 unsigned long
-arch_get_unmapped_area_topdown_vmflags(struct file *filp, unsigned long addr0,
+arch_get_unmapped_area_topdown(struct file *filp, unsigned long addr0,
                          unsigned long len, unsigned long pgoff,
                          unsigned long flags, vm_flags_t vm_flags)
 {
@@ -228,20 +228,5 @@ bottomup:
         * can happen with large stack limits and large mmap()
         * allocations.
         */
-       return arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
-}
-
-unsigned long
-arch_get_unmapped_area(struct file *filp, unsigned long addr,
-               unsigned long len, unsigned long pgoff, unsigned long flags)
-{
-       return arch_get_unmapped_area_vmflags(filp, addr, len, pgoff, flags, 0);
-}
-
-unsigned long
-arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr,
-                         const unsigned long len, const unsigned long pgoff,
-                         const unsigned long flags)
-{
-       return arch_get_unmapped_area_topdown_vmflags(filp, addr, len, pgoff, flags, 0);
+       return arch_get_unmapped_area(filp, addr0, len, pgoff, flags, 0);
 }

diff --git a/arch/xtensa/kernel/syscall.c b/arch/xtensa/kernel/syscall.c
index b3c2450d6f239e6b8f534eba2969b8758d71a1fa..dc54f854c2f58d7c8364a9b86c0e12a02e4587cd 100644 (file)
--- a/arch/xtensa/kernel/syscall.c
+++ b/arch/xtensa/kernel/syscall.c
@@ -55,7 +55,8 @@ asmlinkage long xtensa_fadvise64_64(int fd, int advice,
 
 #ifdef CONFIG_MMU
 unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
-               unsigned long len, unsigned long pgoff, unsigned long flags)
+               unsigned long len, unsigned long pgoff, unsigned long flags,
+               vm_flags_t vm_flags)
 {
        struct vm_area_struct *vmm;
        struct vma_iterator vmi;

diff --git a/include/linux/sched/mm.h b/include/linux/sched/mm.h
index 91546493c43da2ad424992e227d9051661822598..c4d34abc45d40b14f942daa9c5b71487943c5336 100644 (file)
--- a/include/linux/sched/mm.h
+++ b/include/linux/sched/mm.h
@@ -179,27 +179,20 @@ static inline void mm_update_next_owner(struct mm_struct *mm)
 
 extern void arch_pick_mmap_layout(struct mm_struct *mm,
                                  struct rlimit *rlim_stack);
-extern unsigned long
-arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
-                      unsigned long, unsigned long);
-extern unsigned long
+
+unsigned long
+arch_get_unmapped_area(struct file *filp, unsigned long addr,
+                      unsigned long len, unsigned long pgoff,
+                      unsigned long flags, vm_flags_t vm_flags);
+unsigned long
 arch_get_unmapped_area_topdown(struct file *filp, unsigned long addr,
-                         unsigned long len, unsigned long pgoff,
-                         unsigned long flags);
+                              unsigned long len, unsigned long pgoff,
+                              unsigned long flags, vm_flags_t);
 
 unsigned long mm_get_unmapped_area(struct mm_struct *mm, struct file *filp,
                                   unsigned long addr, unsigned long len,
                                   unsigned long pgoff, unsigned long flags);
 
-unsigned long
-arch_get_unmapped_area_vmflags(struct file *filp, unsigned long addr,
-                              unsigned long len, unsigned long pgoff,
-                              unsigned long flags, vm_flags_t vm_flags);
-unsigned long
-arch_get_unmapped_area_topdown_vmflags(struct file *filp, unsigned long addr,
-                                      unsigned long len, unsigned long pgoff,
-                                      unsigned long flags, vm_flags_t);
-
 unsigned long mm_get_unmapped_area_vmflags(struct mm_struct *mm,
                                           struct file *filp,
                                           unsigned long addr,

diff --git a/mm/mmap.c b/mm/mmap.c
index 02f7b45c307666e7035d8c6d66f772a6113045ba..98249266196efed32ffae0777aa4b4512865f939 100644 (file)
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -770,7 +770,7 @@ generic_get_unmapped_area(struct file *filp, unsigned long addr,
 unsigned long
 arch_get_unmapped_area(struct file *filp, unsigned long addr,
                       unsigned long len, unsigned long pgoff,
-                      unsigned long flags)
+                      unsigned long flags, vm_flags_t vm_flags)
 {
        return generic_get_unmapped_area(filp, addr, len, pgoff, flags);
 }
@@ -834,38 +834,21 @@ generic_get_unmapped_area_topdown(struct file *filp, unsigned long addr,
 unsigned long
 arch_get_unmapped_area_topdown(struct file *filp, unsigned long addr,
                               unsigned long len, unsigned long pgoff,
-                              unsigned long flags)
+                              unsigned long flags, vm_flags_t vm_flags)
 {
        return generic_get_unmapped_area_topdown(filp, addr, len, pgoff, flags);
 }
 #endif
 
-#ifndef HAVE_ARCH_UNMAPPED_AREA_VMFLAGS
-unsigned long
-arch_get_unmapped_area_vmflags(struct file *filp, unsigned long addr, unsigned long len,
-                              unsigned long pgoff, unsigned long flags, vm_flags_t vm_flags)
-{
-       return arch_get_unmapped_area(filp, addr, len, pgoff, flags);
-}
-
-unsigned long
-arch_get_unmapped_area_topdown_vmflags(struct file *filp, unsigned long addr,
-                                      unsigned long len, unsigned long pgoff,
-                                      unsigned long flags, vm_flags_t vm_flags)
-{
-       return arch_get_unmapped_area_topdown(filp, addr, len, pgoff, flags);
-}
-#endif
-
 unsigned long mm_get_unmapped_area_vmflags(struct mm_struct *mm, struct file *filp,
                                           unsigned long addr, unsigned long len,
                                           unsigned long pgoff, unsigned long flags,
                                           vm_flags_t vm_flags)
 {
        if (test_bit(MMF_TOPDOWN, &mm->flags))
-               return arch_get_unmapped_area_topdown_vmflags(filp, addr, len, pgoff,
-                                                             flags, vm_flags);
-       return arch_get_unmapped_area_vmflags(filp, addr, len, pgoff, flags, vm_flags);
+               return arch_get_unmapped_area_topdown(filp, addr, len, pgoff,
+                                                     flags, vm_flags);
+       return arch_get_unmapped_area(filp, addr, len, pgoff, flags, vm_flags);
 }
 
 unsigned long
@@ -927,8 +910,8 @@ mm_get_unmapped_area(struct mm_struct *mm, struct file *file,
                     unsigned long pgoff, unsigned long flags)
 {
        if (test_bit(MMF_TOPDOWN, &mm->flags))
-               return arch_get_unmapped_area_topdown(file, addr, len, pgoff, flags);
-       return arch_get_unmapped_area(file, addr, len, pgoff, flags);
+               return arch_get_unmapped_area_topdown(file, addr, len, pgoff, flags, 0);
+       return arch_get_unmapped_area(file, addr, len, pgoff, flags, 0);
 }
 EXPORT_SYMBOL(mm_get_unmapped_area);