diff options
author | KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> | 2006-03-27 04:15:43 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-27 11:44:46 -0500 |
commit | 0d833b41092df2f4a65cbdb0a0a947c35cdd2f9d (patch) | |
tree | 4a5369cb510411761ce50c789f18bf7b6aa7d867 /include/asm-parisc/page.h | |
parent | a02036e796e5046fe0463b9a092e9b617c525866 (diff) |
[PATCH] unify pfn_to_page: parisc pfn_to_page
PARISC can use generic funcs.
Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Kyle McMartin <kyle@mcmartin.ca>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-parisc/page.h')
-rw-r--r-- | include/asm-parisc/page.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/asm-parisc/page.h b/include/asm-parisc/page.h index 4a6752b0afed..9f303c0c3cd7 100644 --- a/include/asm-parisc/page.h +++ b/include/asm-parisc/page.h | |||
@@ -130,8 +130,6 @@ extern int npmem_ranges; | |||
130 | #define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET)) | 130 | #define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET)) |
131 | 131 | ||
132 | #ifndef CONFIG_DISCONTIGMEM | 132 | #ifndef CONFIG_DISCONTIGMEM |
133 | #define pfn_to_page(pfn) (mem_map + (pfn)) | ||
134 | #define page_to_pfn(page) ((unsigned long)((page) - mem_map)) | ||
135 | #define pfn_valid(pfn) ((pfn) < max_mapnr) | 133 | #define pfn_valid(pfn) ((pfn) < max_mapnr) |
136 | #endif /* CONFIG_DISCONTIGMEM */ | 134 | #endif /* CONFIG_DISCONTIGMEM */ |
137 | 135 | ||
@@ -152,6 +150,7 @@ extern int npmem_ranges; | |||
152 | 150 | ||
153 | #endif /* __KERNEL__ */ | 151 | #endif /* __KERNEL__ */ |
154 | 152 | ||
153 | #include <asm-generic/memory_model.h> | ||
155 | #include <asm-generic/page.h> | 154 | #include <asm-generic/page.h> |
156 | 155 | ||
157 | #endif /* _PARISC_PAGE_H */ | 156 | #endif /* _PARISC_PAGE_H */ |