From 77e6b32ee8e593fcfce1d124f5ab33ec4b3168b4 Mon Sep 17 00:00:00 2001 From: Russell King Date: Tue, 16 Jan 2007 14:01:47 +0000 Subject: [PATCH] --- yaml --- r: 45923 b: refs/heads/master c: 204ecae4e10c235e6987cb7b2809a665511ab174 h: refs/heads/master i: 45921: 9ecc3578f186a469ea021b091a22bd2fdaa20363 45919: ada8b720835c06fb695d0b9608d10f5af6643370 v: v3 --- [refs] | 2 +- trunk/arch/arm/mm/init.c | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 1c5afa73740e..2d650c5b976c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 30f0e0f4153918a22d802b415980974514139389 +refs/heads/master: 204ecae4e10c235e6987cb7b2809a665511ab174 diff --git a/trunk/arch/arm/mm/init.c b/trunk/arch/arm/mm/init.c index b5814b4b6f35..7760193e74cc 100644 --- a/trunk/arch/arm/mm/init.c +++ b/trunk/arch/arm/mm/init.c @@ -52,15 +52,18 @@ void show_mem(void) printk("Free swap: %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10)); for_each_online_node(node) { + pg_data_t *n = NODE_DATA(node); + struct page *map = n->node_mem_map - n->node_start_pfn; + for_each_nodebank (i,mi,node) { unsigned int pfn1, pfn2; struct page *page, *end; - pfn1 = mi->bank[i].start >> PAGE_SHIFT; - pfn2 = (mi->bank[i].size + mi->bank[i].start) >> PAGE_SHIFT; + pfn1 = __phys_to_pfn(mi->bank[i].start); + pfn2 = __phys_to_pfn(mi->bank[i].size + mi->bank[i].start); - page = NODE_MEM_MAP(node) + pfn1; - end = NODE_MEM_MAP(node) + pfn2; + page = map + pfn1; + end = map + pfn2; do { total++;