summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorHaren Myneni <hbabu@us.ibm.com>2004-09-02 20:25:05 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-09-02 20:25:05 -0700
commit78d2ba744d9af157520c64bf0727188fd0da2be2 (patch)
treef96b7ec2a708c0d8cce56b82f90fe65a501a9b20 /include
parent8d51b0323a70be6aceea92fb0408051a2271fbe3 (diff)
[PATCH] ppc64: implement page_is_ram
This patch contains - Removes __initdata from lmb definition (struct lmb lmb;) and modified the existing page_is_ram function. Also changed the current argument from physical address to pfn to make it compatible across architectures. Please review them and send me your comments/suggestions. If you are OK with any one patch, please include it in the mainline kernel. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
-rw-r--r--include/asm-ppc64/lmb.h2
-rw-r--r--include/asm-ppc64/page.h3
2 files changed, 2 insertions, 3 deletions
diff --git a/include/asm-ppc64/lmb.h b/include/asm-ppc64/lmb.h
index 43a2f70cf4d3..8dc2a07eac56 100644
--- a/include/asm-ppc64/lmb.h
+++ b/include/asm-ppc64/lmb.h
@@ -47,7 +47,7 @@ struct lmb {
struct lmb_region reserved;
};
-extern struct lmb lmb __initdata;
+extern struct lmb lmb;
extern void __init lmb_init(void);
extern void __init lmb_analyze(void);
diff --git a/include/asm-ppc64/page.h b/include/asm-ppc64/page.h
index 0bd698f6b10d..af8219b8e775 100644
--- a/include/asm-ppc64/page.h
+++ b/include/asm-ppc64/page.h
@@ -181,8 +181,7 @@ static inline int get_order(unsigned long size)
#define __pa(x) ((unsigned long)(x)-PAGE_OFFSET)
-/* Not 100% correct, for use by /dev/mem only */
-extern int page_is_ram(unsigned long physaddr);
+extern int page_is_ram(unsigned long pfn);
#endif /* __ASSEMBLY__ */