aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-10-13 20:22:41 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-10-13 20:22:41 -0400
commitdf133e8fa8e1d4afa57c84953bf80eaed2b145e0 (patch)
tree863d38b50f91629513a414227874a1142d5d21e5 /mm
parente3438330f58330ec236c861d43f46bef06780e62 (diff)
parentbeb9147e95a75f41c984d7235cf6d59f3ca2d5db (diff)
Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 mm updates from Ingo Molnar: "This tree includes the following changes: - fix memory hotplug - fix hibernation bootup memory layout assumptions - fix hyperv numa guest kernel messages - remove dead code - update documentation" * 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/mm: Update memory map description to list hypervisor-reserved area x86/mm, hibernate: Do not assume the first e820 area to be RAM x86/mm/numa: Drop dead code and rename setup_node_data() to setup_alloc_data() x86/mm/hotplug: Modify PGD entry when removing memory x86/mm/hotplug: Pass sync_global_pgds() a correct argument in remove_pagetable() x86: Remove set_pmd_pfn
Diffstat (limited to 'mm')
-rw-r--r--mm/page_alloc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index c9710c9bbee2..736d8e1b6381 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -4971,6 +4971,8 @@ void __paginginit free_area_init_node(int nid, unsigned long *zones_size,
4971 pgdat->node_start_pfn = node_start_pfn; 4971 pgdat->node_start_pfn = node_start_pfn;
4972#ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP 4972#ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP
4973 get_pfn_range_for_nid(nid, &start_pfn, &end_pfn); 4973 get_pfn_range_for_nid(nid, &start_pfn, &end_pfn);
4974 printk(KERN_INFO "Initmem setup node %d [mem %#010Lx-%#010Lx]\n", nid,
4975 (u64) start_pfn << PAGE_SHIFT, (u64) (end_pfn << PAGE_SHIFT) - 1);
4974#endif 4976#endif
4975 calculate_node_totalpages(pgdat, start_pfn, end_pfn, 4977 calculate_node_totalpages(pgdat, start_pfn, end_pfn,
4976 zones_size, zholes_size); 4978 zones_size, zholes_size);