unify pfn_to_page take 2 [3/25] x86_64 funcs
PATCH 1/1 unify pfn_to_page take 2 [3/25] x86_64 funcs
x86_64 can use generic one.
When DISCONTIGMEM is selected, CONFIG_DONT_INLINE_PFN_TO_PAGE=y. pfn_to_page/page_to_pfn are not inlined.
Signed-off-by KAMEZAWA Hiroyuki <[email protected]>
arch/x86_64/mm/numa.c +0 -22
@@ -362,28 +362,6 @@ EXPORT_SYMBOL(memnodemap);EXPORT_SYMBOL (node_data);#ifdef CONFIG_DISCONTIGMEM -/* -* Functions to convert PFNs from/to per node page addresses. -* These are out of line because they are quite big. -* They could be all tuned by pre caching more state. -* Should do that. -*/ - -/* Requires pfn_valid(pfn) to be true */ -struct page *pfn_to_page (unsigned long pfn) -{ -int nid =phys_to_nid (((unsigned long )(pfn)) <<PAGE_SHIFT ); -return (pfn -node_start_pfn (nid)) +NODE_DATA (nid)->node_mem_map; -} -EXPORT_SYMBOL (pfn_to_page); - -unsigned long page_to_pfn (struct page *page) -{ -return (long )(((page) -page_zone (page)->zone_mem_map) + -page_zone (page)->zone_start_pfn); -} -EXPORT_SYMBOL (page_to_pfn); -int pfn_valid (unsigned long pfn) {unsigned nid;
include/asm-x86_64/mmzone.h +0 -2
@@ -39,8 +39,6 @@ static inline __attribute__((pure)) int#define pfn_to_nid (pfn) phys_to_nid((unsigned long)(pfn) << PAGE_SHIFT)#define kvaddr_to_nid (kaddr) phys_to_nid(__pa(kaddr)) -extern struct page *pfn_to_page (unsigned long pfn); -extern unsigned long page_to_pfn (struct page *page);extern int pfn_valid (unsigned long pfn);#endif
include/asm-x86_64/page.h +0 -2
@@ -123,8 +123,6 @@ typedef struct { unsigned long pgprot; }#define __boot_va (x) __va(x)#define __boot_pa (x) __pa(x)#ifdef CONFIG_FLATMEM -#define pfn_to_page (pfn) (mem_map + (pfn)) -#define page_to_pfn (page) ((unsigned long)((page) - mem_map))#define pfn_valid (pfn) ((pfn) < end_pfn)#endif
arch/x86_64/Kconfig +4 -0
@@ -321,6 +321,10 @@ config HAVE_ARCH_EARLY_PFN_TO_NID def_bool y depends on NUMA +config DONT_INLINE_PFN_TO_PAGE + def_bool y + depends on DISCONTIGMEM + config NR_CPUS int "Maximum number of CPUs (2-256)" range 2 256