| Message ID | 20220413055840.392628-8-anshuman.khandual@arm.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | mm/mmap: Drop arch_vm_get_page_prot() and arch_filter_pgprot() | expand |
Le 13/04/2022 à 07:58, Anshuman Khandual a écrit : > There are no platforms left which use arch_vm_get_page_prot(). Just drop > generic arch_vm_get_page_prot(). > > Cc: Andrew Morton <akpm@linux-foundation.org> > Cc: linux-mm@kvack.org > Cc: linux-kernel@vger.kernel.org > Reviewed-by: Catalin Marinas <catalin.marinas@arm.com> Reviewed-by: Christophe Leroy <christophe.leroy@csgroup.eu> > Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com> > --- > include/linux/mman.h | 4 ---- > mm/mmap.c | 4 +--- > 2 files changed, 1 insertion(+), 7 deletions(-) > > diff --git a/include/linux/mman.h b/include/linux/mman.h > index b66e91b8176c..58b3abd457a3 100644 > --- 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 b96e995f3733..475b7c367032 100644 > --- a/mm/mmap.c > +++ b/mm/mmap.c > @@ -109,9 +109,7 @@ pgprot_t protection_map[16] __ro_after_init = { > #ifndef CONFIG_ARCH_HAS_VM_GET_PAGE_PROT > pgprot_t vm_get_page_prot(unsigned long vm_flags) > { > - return __pgprot(pgprot_val(protection_map[vm_flags & > - (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]) | > - pgprot_val(arch_vm_get_page_prot(vm_flags))); > + return protection_map[vm_flags & (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]; > } > EXPORT_SYMBOL(vm_get_page_prot); > #endif /* CONFIG_ARCH_HAS_VM_GET_PAGE_PROT */
diff --git a/include/linux/mman.h b/include/linux/mman.h index b66e91b8176c..58b3abd457a3 100644 --- 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 b96e995f3733..475b7c367032 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -109,9 +109,7 @@ pgprot_t protection_map[16] __ro_after_init = { #ifndef CONFIG_ARCH_HAS_VM_GET_PAGE_PROT pgprot_t vm_get_page_prot(unsigned long vm_flags) { - return __pgprot(pgprot_val(protection_map[vm_flags & - (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]) | - pgprot_val(arch_vm_get_page_prot(vm_flags))); + return protection_map[vm_flags & (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]; } EXPORT_SYMBOL(vm_get_page_prot); #endif /* CONFIG_ARCH_HAS_VM_GET_PAGE_PROT */