Commit e5080a96 authored by Mike Rapoport (IBM)'s avatar Mike Rapoport (IBM) Committed by Andrew Morton
Browse files

mm, arch: add generic implementation of pfn_valid() for FLATMEM 

Every architecture that supports FLATMEM memory model defines its own
version of pfn_valid() that essentially compares a pfn to max_mapnr.

Use mips/powerpc version implemented as static inline as a generic
implementation of pfn_valid() and drop its per-architecture definitions.

[rppt@kernel.org: fix the generic pfn_valid()]
  Link: https://lkml.kernel.org/r/Y9lg7R1Yd931C+y5@kernel.org
Link: https://lkml.kernel.org/r/20230129124235.209895-5-rppt@kernel.org


Signed-off-by: default avatarMike Rapoport (IBM) <rppt@kernel.org>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: Guo Ren <guoren@kernel.org>		[csky]
Acked-by: Huacai Chen <chenhuacai@loongson.cn>	[LoongArch]
Acked-by: Stafford Horne <shorne@gmail.com>	[OpenRISC]
Acked-by: Michael Ellerman <mpe@ellerman.id.au>	[powerpc]
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Tested-by: default avatarConor Dooley <conor.dooley@microchip.com>
Cc: Brian Cain <bcain@quicinc.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Dinh Nguyen <dinguyen@kernel.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Greg Ungerer <gerg@linux-m68k.org>
Cc: Helge Deller <deller@gmx.de>
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Rich Felker <dalias@libc.org>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Vineet Gupta <vgupta@kernel.org>
Cc: WANG Xuerui <kernel@xen0n.name>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent c2524a6b

arch/alpha/include/asm/page.h

+0 −4
Original line number Diff line number Diff line
@@ -86,10 +86,6 @@ typedef struct page *pgtable_t; 
#define virt_to_page(kaddr)	pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)

#define virt_addr_valid(kaddr)	pfn_valid((__pa(kaddr) >> PAGE_SHIFT))



#ifdef CONFIG_FLATMEM

#define pfn_valid(pfn)		((pfn) < max_mapnr)

#endif /* CONFIG_FLATMEM */



#include <asm-generic/memory_model.h>

#include <asm-generic/getorder.h>

arch/arc/include/asm/page.h

+0 −1
Original line number Diff line number Diff line
@@ -109,7 +109,6 @@ extern int pfn_valid(unsigned long pfn); 
#else /* CONFIG_HIGHMEM */



#define ARCH_PFN_OFFSET		virt_to_pfn(CONFIG_LINUX_RAM_BASE)

#define pfn_valid(pfn)		(((pfn) - ARCH_PFN_OFFSET) < max_mapnr)



#endif /* CONFIG_HIGHMEM */

arch/csky/include/asm/page.h

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ 


#define virt_addr_valid(kaddr)  ((void *)(kaddr) >= (void *)PAGE_OFFSET && \

			(void *)(kaddr) < high_memory)

#define pfn_valid(pfn)		((pfn) >= ARCH_PFN_OFFSET && ((pfn) - ARCH_PFN_OFFSET) < max_mapnr)



extern void *memset(void *dest, int c, size_t l);

extern void *memcpy(void *to, const void *from, size_t l);

arch/hexagon/include/asm/page.h

+0 −1
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ struct page; 
/* Default vm area behavior is non-executable.  */

#define VM_DATA_DEFAULT_FLAGS	VM_DATA_FLAGS_NON_EXEC



#define pfn_valid(pfn) ((pfn) < max_mapnr)

#define virt_addr_valid(kaddr) pfn_valid(__pa(kaddr) >> PAGE_SHIFT)



/*  Need to not use a define for linesize; may move this to another file.  */

arch/ia64/include/asm/page.h

+0 −4
Original line number Diff line number Diff line
@@ -95,10 +95,6 @@ do { \ 


#include <asm-generic/memory_model.h>



#ifdef CONFIG_FLATMEM

# define pfn_valid(pfn)		((pfn) < max_mapnr)

#endif



#define page_to_phys(page)	(page_to_pfn(page) << PAGE_SHIFT)

#define virt_to_page(kaddr)	pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)

#define pfn_to_kaddr(pfn)	__va((pfn) << PAGE_SHIFT)