Skip to contentSkip to conversation

unify pfn_to_page [14/25] parisc pfn_to_page/page_to_pfn

RFC PATCH New KAMEZAWA Hiroyuki 1 participant 1 message Feb 6, 2006

lore
Share & tools
lore
#0 lore raw

RFC PATCH 1/1 unify pfn_to_page [14/25] parisc pfn_to_page/page_to_pfn

PA-RISC can use generic ones.

include/asm-parisc/mmzone.h +1 -16
Index: cleanup_pfn_page/include/asm-parisc/mmzone.h
===================================================================
@@ -26,22 +26,7 @@ extern struct node_map_data node_data[];
 	__pgdat->node_start_pfn + __pgdat->node_spanned_pages;		\
 })
 #define node_localnr(pfn, nid)		((pfn) - node_start_pfn(nid))
-
-#define pfn_to_page(pfn)						\
-({									\
-	unsigned long __pfn = (pfn);					\
-	int __node  = pfn_to_nid(__pfn);				\
-	&NODE_DATA(__node)->node_mem_map[node_localnr(__pfn,__node)];	\
-})
-
-#define page_to_pfn(pg)							\
-({									\
-	struct page *__page = pg;					\
-	struct zone *__zone = page_zone(__page);			\
-	BUG_ON(__zone == NULL);						\
-	(unsigned long)(__page - __zone->zone_mem_map)			\
-		+ __zone->zone_start_pfn;				\
-})
+#define arch_pfn_to_nid(pfn)	pfn_to_nid(pfn)
 
 /* We have these possible memory map layouts:
  * Astro: 0-3.75, 67.75-68, 4-64
include/asm-parisc/page.h +0 -2
Index: cleanup_pfn_page/include/asm-parisc/page.h
===================================================================
@@ -130,8 +130,6 @@ extern int npmem_ranges;
 #define __va(x)			((void *)((unsigned long)(x)+PAGE_OFFSET))
 
 #ifndef CONFIG_DISCONTIGMEM
-#define pfn_to_page(pfn)	(mem_map + (pfn))
-#define page_to_pfn(page)	((unsigned long)((page) - mem_map))
 #define pfn_valid(pfn)		((pfn) < max_mapnr)
 #endif /* CONFIG_DISCONTIGMEM */