Commit 204ecae4 authored by Russell King's avatar Russell King Committed by Russell King

[ARM] Fix show_mem() for discontigmem

show_mem() was assuming incorrectly that the mem_map for any
node started at PFN 0.  This is obviously wrong; fix it to
take account of node_start_pfn.
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 30f0e0f4
...@@ -52,15 +52,18 @@ void show_mem(void) ...@@ -52,15 +52,18 @@ void show_mem(void)
printk("Free swap: %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10)); printk("Free swap: %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10));
for_each_online_node(node) { 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) { for_each_nodebank (i,mi,node) {
unsigned int pfn1, pfn2; unsigned int pfn1, pfn2;
struct page *page, *end; struct page *page, *end;
pfn1 = mi->bank[i].start >> PAGE_SHIFT; pfn1 = __phys_to_pfn(mi->bank[i].start);
pfn2 = (mi->bank[i].size + mi->bank[i].start) >> PAGE_SHIFT; pfn2 = __phys_to_pfn(mi->bank[i].size + mi->bank[i].start);
page = NODE_MEM_MAP(node) + pfn1; page = map + pfn1;
end = NODE_MEM_MAP(node) + pfn2; end = map + pfn2;
do { do {
total++; total++;
......
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