diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-06 08:38:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-06 08:38:03 -0700 |
| commit | 325ce9e3060960488fa2c1c9eccde5ad85d75e7c (patch) | |
| tree | 836f4aebacd0741f02647986b386fdd0ac58a69d /arch/arm/mm/init.c | |
| parent | bbfdbe9dc00dc3fd6cba9b0f96adc46d025c9079 (diff) | |
| parent | 257dab81413b31b8648becfe11586b3a41e5c29a (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] pxa/colibri: fix missing #include <mach/mfp.h> in colibri.h
[ARM] pxa/spitz: fix On/off key name to fix warning during boot
[ARM] pxa: fix the incorrect cpu_is_pxa950()
[ARM] pxa: update cpuid pattern for pxa9xx in head.S
[ARM] pxa/viper: fix timeout usage for I2C
[ARM] pxa/raumfeld: fix button name
[ARM] pxa/imote2: Fix iMote2 defconfig
[ARM] pxa: add missing new line to regs-u2d.h
ARM: 6093/1: Fix kernel memory printing for sparsemem
arch/arm/include/asm/elf.h: forward-declare the task-struct
arch/arm/plat-pxa/dma.c: correct NULL test
ARM: 6076/1: SA1100: add processor check to sa1110-cpufreq driver
ARM: 6075/1: SA1100: fix wrong CPU type for h3100 and h3600
ARM: Update mach-types
ARM: 6066/1: Fix "BUG: scheduling while atomic: swapper/0/0x00000002
ARM: 6068/1: Fix build break with KPROBES enabled
mx5: Fix build error for mx51_defconfig
Diffstat (limited to 'arch/arm/mm/init.c')
| -rw-r--r-- | arch/arm/mm/init.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index 83db12a68d5..0ed29bfeba1 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c @@ -86,9 +86,6 @@ void show_mem(void) printk("Mem-info:\n"); show_free_areas(); for_each_online_node(node) { - pg_data_t *n = NODE_DATA(node); - struct page *map = pgdat_page_nr(n, 0) - n->node_start_pfn; - for_each_nodebank (i,mi,node) { struct membank *bank = &mi->bank[i]; unsigned int pfn1, pfn2; @@ -97,8 +94,8 @@ void show_mem(void) pfn1 = bank_pfn_start(bank); pfn2 = bank_pfn_end(bank); - page = map + pfn1; - end = map + pfn2; + page = pfn_to_page(pfn1); + end = pfn_to_page(pfn2 - 1) + 1; do { total++; @@ -603,9 +600,6 @@ void __init mem_init(void) reserved_pages = free_pages = 0; for_each_online_node(node) { - pg_data_t *n = NODE_DATA(node); - struct page *map = pgdat_page_nr(n, 0) - n->node_start_pfn; - for_each_nodebank(i, &meminfo, node) { struct membank *bank = &meminfo.bank[i]; unsigned int pfn1, pfn2; @@ -614,8 +608,8 @@ void __init mem_init(void) pfn1 = bank_pfn_start(bank); pfn2 = bank_pfn_end(bank); - page = map + pfn1; - end = map + pfn2; + page = pfn_to_page(pfn1); + end = pfn_to_page(pfn2 - 1) + 1; do { if (PageReserved(page)) |