diff options
| author | Tony Luck <tony.luck@intel.com> | 2008-04-17 10:14:51 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2008-04-17 10:14:51 -0700 |
| commit | 71b264f85ff50c14fe945ffff06ae0d5e9a9124e (patch) | |
| tree | 9fd79c63fd630c4d030a97d254d42a3a73f1328b /arch/ia64/mm/discontig.c | |
| parent | f4df39cbdd9e9ab615e80148cc271db22a8508ad (diff) | |
| parent | 072f042df335d7e0da2027637bcf720d7ff1589b (diff) | |
| download | kernel_samsung_smdk4412-71b264f85ff50c14fe945ffff06ae0d5e9a9124e.zip kernel_samsung_smdk4412-71b264f85ff50c14fe945ffff06ae0d5e9a9124e.tar.gz kernel_samsung_smdk4412-71b264f85ff50c14fe945ffff06ae0d5e9a9124e.tar.bz2 | |
Pull miscellaneous into release branch
Conflicts:
arch/ia64/kernel/mca.c
Diffstat (limited to 'arch/ia64/mm/discontig.c')
| -rw-r--r-- | arch/ia64/mm/discontig.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c index 6136a4c..544dc42 100644 --- a/arch/ia64/mm/discontig.c +++ b/arch/ia64/mm/discontig.c @@ -445,7 +445,7 @@ void __init find_memory(void) mem_data[node].min_pfn = ~0UL; } - efi_memmap_walk(register_active_ranges, NULL); + efi_memmap_walk(filter_memory, register_active_ranges); /* * Initialize the boot memory maps in reverse order since that's @@ -519,8 +519,6 @@ void show_mem(void) printk(KERN_INFO "Mem-info:\n"); show_free_areas(); - printk(KERN_INFO "Free swap: %6ldkB\n", - nr_swap_pages<<(PAGE_SHIFT-10)); printk(KERN_INFO "Node memory in pages:\n"); for_each_online_pgdat(pgdat) { unsigned long present; |