aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2005-01-11 01:49:59 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-01-11 01:49:59 -0800
commit415f704d2642e03ef53d1f0aaa3219ac24abe75d (patch)
tree990ef537db2a399a20aa5225554aef09b3f8264c /arch
parent46e801e5ad461e6c17cb83bd72d1d84c0cb25626 (diff)
downloadhistory-415f704d2642e03ef53d1f0aaa3219ac24abe75d.tar.gz
[PATCH] x86_64: Remove direct mem_map references
This removes all but one direct reference to mem_map for x86-64. This is needed on systems where we break the mem_map up and directly indexing into mem_map to get the page structure doesn't work anymore. Signed-off-by: Matt Tolentino <matthew.e.tolentino@intel.com> Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86_64/mm/init.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86_64/mm/init.c b/arch/x86_64/mm/init.c
index f47f0715e37f4e..c2ac2b4b78423d 100644
--- a/arch/x86_64/mm/init.c
+++ b/arch/x86_64/mm/init.c
@@ -68,8 +68,8 @@ void show_mem(void)
for_each_pgdat(pgdat) {
for (i = 0; i < pgdat->node_spanned_pages; ++i) {
- page = pgdat->node_mem_map + i;
- total++;
+ page = pfn_to_page(pgdat->node_start_pfn + i);
+ total++;
if (PageReserved(page))
reserved++;
else if (PageSwapCache(page))
@@ -437,7 +437,7 @@ void __init mem_init(void)
/*
* Only count reserved RAM pages
*/
- if (page_is_ram(tmp) && PageReserved(mem_map+tmp))
+ if (page_is_ram(tmp) && PageReserved(pfn_to_page(tmp)))
reservedpages++;
#endif