[PATCH] unify pfn_to_page take 2 [11/25] ia64 funcs

[KAMEZAWA Hiroyuki]

If CONFIG_DISCONTIGMEM==y, VIRTUAL_MEM_MAP is selecetd.
In this case, we cannot use generic one.

Signed-Off-By: KAMEZAWA Hiruyoki <kamezawa.hiroyu@xxxxxxxxxxxxxx>

Index: test-layout-free-zone/arch/ia64/Kconfig
===================================================================
--- test-layout-free-zone.orig/arch/ia64/Kconfig
+++ test-layout-free-zone/arch/ia64/Kconfig
@@ -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
Index: test-layout-free-zone/include/asm-ia64/page.h
===================================================================
--- test-layout-free-zone.orig/include/asm-ia64/page.h
+++ test-layout-free-zone/include/asm-ia64/page.h
@@ -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;

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/