Commit 0d833b41 authored by KAMEZAWA Hiroyuki's avatar KAMEZAWA Hiroyuki Committed by Linus Torvalds

[PATCH] unify pfn_to_page: parisc pfn_to_page

PARISC can use generic funcs.
Signed-off-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Kyle McMartin <kyle@mcmartin.ca>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a02036e7
...@@ -25,23 +25,6 @@ extern struct node_map_data node_data[]; ...@@ -25,23 +25,6 @@ extern struct node_map_data node_data[];
pg_data_t *__pgdat = NODE_DATA(nid); \ pg_data_t *__pgdat = NODE_DATA(nid); \
__pgdat->node_start_pfn + __pgdat->node_spanned_pages; \ __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; \
})
/* We have these possible memory map layouts: /* We have these possible memory map layouts:
* Astro: 0-3.75, 67.75-68, 4-64 * Astro: 0-3.75, 67.75-68, 4-64
......
...@@ -130,8 +130,6 @@ extern int npmem_ranges; ...@@ -130,8 +130,6 @@ extern int npmem_ranges;
#define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET)) #define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET))
#ifndef CONFIG_DISCONTIGMEM #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) #define pfn_valid(pfn) ((pfn) < max_mapnr)
#endif /* CONFIG_DISCONTIGMEM */ #endif /* CONFIG_DISCONTIGMEM */
...@@ -152,6 +150,7 @@ extern int npmem_ranges; ...@@ -152,6 +150,7 @@ extern int npmem_ranges;
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#include <asm-generic/memory_model.h>
#include <asm-generic/page.h> #include <asm-generic/page.h>
#endif /* _PARISC_PAGE_H */ #endif /* _PARISC_PAGE_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment