Messages in this thread Patch in this message | | | Date | Tue, 14 Feb 2006 19:19:19 +0900 | From | KAMEZAWA Hiroyuki <> | Subject | [PATCH] unify pfn_to_page take3 [6/23] arm pfn_to_page |
| |
ARM can use generic funcs. PFN_TO_NID, LOCAL_MAP_NR are defined by sub-archs.
Signed-Off-By: KAMEZAWA Hirotuki <kamezawa.hiroyu@jp.fujitsu.com>
Index: testtree/include/asm-arm/memory.h =================================================================== --- testtree.orig/include/asm-arm/memory.h +++ testtree/include/asm-arm/memory.h @@ -172,9 +172,7 @@ static inline __deprecated void *bus_to_ * virt_addr_valid(k) indicates whether a virtual address is valid */ #ifndef CONFIG_DISCONTIGMEM - -#define page_to_pfn(page) (((page) - mem_map) + PHYS_PFN_OFFSET) -#define pfn_to_page(pfn) ((mem_map + (pfn)) - PHYS_PFN_OFFSET) +#define ARCH_PFN_OFFSET (PHYS_PFN_OFFSET) #define pfn_valid(pfn) ((pfn) >= PHYS_PFN_OFFSET && (pfn) < (PHYS_PFN_OFFSET + max_mapnr))
#define virt_to_page(kaddr) (pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)) @@ -189,13 +187,8 @@ static inline __deprecated void *bus_to_ * around in memory. */ #include <linux/numa.h> - -#define page_to_pfn(page) \ - (( (page) - page_zone(page)->zone_mem_map) \ - + page_zone(page)->zone_start_pfn) - -#define pfn_to_page(pfn) \ - (PFN_TO_MAPBASE(pfn) + LOCAL_MAP_NR((pfn) << PAGE_SHIFT)) +#define arch_pfn_to_nid(pfn) (PFN_TO_NID(pfn)) +#define arch_local_page_offset(pfn, nid) (LOCAL_MAP_NR((pfn) << PAGE_OFFSET))
#define pfn_valid(pfn) \ ({ \ @@ -222,6 +215,7 @@ static inline __deprecated void *bus_to_
#endif /* !CONFIG_DISCONTIGMEM */
+ /* * For BIO. "will die". Kill me when bio_to_phys() and bvec_to_phys() die. */ @@ -243,4 +237,6 @@ static inline __deprecated void *bus_to_
#endif
+#include <asm-generic/memory_model.h> + #endif - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |