PATCH] unify pfn_to_page take 2 [5/25] alpha funcs
Alpha can use generic pfn_to_page definition.
Signed-off-by KAMEZAWA Hiroyuki <[email protected]>
include/asm-alpha/mmzone.h +1 -12
@@ -104,19 +104,8 @@ PLAT_NODE_DATA_LOCALNR(unsigned long p, __xx; \ }) -#define pfn_to_page (pfn) \ -({ \ - unsigned long kaddr = (unsigned long)__va((pfn) << PAGE_SHIFT); \ - (NODE_DATA(kvaddr_to_nid(kaddr))->node_mem_map + local_mapnr(kaddr)); \ -}) - -#define page_to_pfn (page) \ - ((page) - page_zone(page)->zone_mem_map + \ - (page_zone(page)->zone_start_pfn)) -#define page_to_pa (page) \ - ((( (page) - page_zone(page)->zone_mem_map ) \ - + page_zone(page)->zone_start_pfn) << PAGE_SHIFT) + (page_to_pfn(page) << PAGE_SHIFT)#define pfn_to_nid (pfn) pa_to_nid(((u64)(pfn) << PAGE_SHIFT))#define pfn_valid (pfn) \
include/asm-alpha/page.h +0 -2
@@ -85,8 +85,6 @@ typedef unsigned long pgprot_t;#define __pa (x) ((unsigned long) (x) - PAGE_OFFSET)#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 virt_to_page (kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)#define pfn_valid (pfn) ((pfn) < max_mapnr)