unify pfn_to_page take 2 [11/25] ia64 funcs
PATCH 1/1 unify pfn_to_page take 2 [11/25] ia64 funcs
If CONFIG_DISCONTIGMEM==y, VIRTUAL_MEM_MAP is selecetd. In this case, we cannot use generic one.
Signed-off-by KAMEZAWA Hiruyoki <[email protected]>
arch/ia64/Kconfig +4 -0
@@ -334,6 +334,10 @@ config HOLES_IN_ZONE bool default y if VIRTUAL_MEM_MAP +config ARCH_HAS_PFN_TO_PAGE + bool + default y if VIRTUAL_MEM_MAP + config HAVE_ARCH_EARLY_PFN_TO_NID def_bool y depends on NEED_MULTIPLE_NODES
include/asm-ia64/page.h +1 -2
@@ -106,9 +106,8 @@ extern int ia64_pfn_valid (unsigned long#ifdef CONFIG_FLATMEM # define pfn_valid (pfn) (((pfn) < max_mapnr) && ia64_pfn_valid(pfn)) -# define page_to_pfn (page) ((unsigned long) (page - mem_map)) -# define pfn_to_page (pfn) (mem_map + (pfn))#elif defined(CONFIG_DISCONTIGMEM ) +/* we already selected CONFIG_ARCH_HASH_PFN_TO_PAGE here */ extern struct page *vmem_map;extern unsigned long min_low_pfn;extern unsigned long max_low_pfn;