mm/mmap: drop arch_vm_get_page_pgprot()

There are no platforms left which use arch_vm_get_page_prot().  Just drop
generic arch_vm_get_page_prot().

Link: https://lkml.kernel.org/r/20220407103251.1209606-8-anshuman.khandual@arm.com
Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Khalid Aziz <khalid.aziz@oracle.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/include/linux/mman.h b/include/linux/mman.h
index b66e91b8176cdc75f83107daf3f223e2076067f5..58b3abd457a38df455a870eca02cb0e63c6a3fc0 100644 (file)
--- a/include/linux/mman.h
+++ b/include/linux/mman.h
@@ -93,10 +93,6 @@ static inline void vm_unacct_memory(long pages)
 #define arch_calc_vm_flag_bits(flags) 0
 #endif
 
-#ifndef arch_vm_get_page_prot
-#define arch_vm_get_page_prot(vm_flags) __pgprot(0)
-#endif
-
 #ifndef arch_validate_prot
 /*
  * This is called from mprotect().  PROT_GROWSDOWN and PROT_GROWSUP have

diff --git a/mm/mmap.c b/mm/mmap.c
index c9507cc8f29e0dddaecd050f5d1cbcbbc2554885..13e8ef8f81f67e04ad250e490173adadac700de9 100644 (file)
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -124,8 +124,7 @@ pgprot_t protection_map[16] __ro_after_init = {
 pgprot_t vm_get_page_prot(unsigned long vm_flags)
 {
        pgprot_t ret = __pgprot(pgprot_val(protection_map[vm_flags &
-                               (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]) |
-                       pgprot_val(arch_vm_get_page_prot(vm_flags)));
+                               (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]));
 
        return ret;
 }