|
@@ -4994,8 +4994,8 @@ void __paginginit free_area_init_node(int nid, unsigned long *zones_size,
|
|
pgdat->node_start_pfn = node_start_pfn;
|
|
pgdat->node_start_pfn = node_start_pfn;
|
|
#ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP
|
|
#ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP
|
|
get_pfn_range_for_nid(nid, &start_pfn, &end_pfn);
|
|
get_pfn_range_for_nid(nid, &start_pfn, &end_pfn);
|
|
- printk(KERN_INFO "Initmem setup node %d [mem %#010Lx-%#010Lx]\n", nid,
|
|
|
|
- (u64) start_pfn << PAGE_SHIFT, (u64) (end_pfn << PAGE_SHIFT) - 1);
|
|
|
|
|
|
+ pr_info("Initmem setup node %d [mem %#018Lx-%#018Lx]\n", nid,
|
|
|
|
+ (u64)start_pfn << PAGE_SHIFT, ((u64)end_pfn << PAGE_SHIFT) - 1);
|
|
#endif
|
|
#endif
|
|
calculate_node_totalpages(pgdat, start_pfn, end_pfn,
|
|
calculate_node_totalpages(pgdat, start_pfn, end_pfn,
|
|
zones_size, zholes_size);
|
|
zones_size, zholes_size);
|
|
@@ -5367,9 +5367,10 @@ void __init free_area_init_nodes(unsigned long *max_zone_pfn)
|
|
arch_zone_highest_possible_pfn[i])
|
|
arch_zone_highest_possible_pfn[i])
|
|
pr_cont("empty\n");
|
|
pr_cont("empty\n");
|
|
else
|
|
else
|
|
- pr_cont("[mem %0#10lx-%0#10lx]\n",
|
|
|
|
- arch_zone_lowest_possible_pfn[i] << PAGE_SHIFT,
|
|
|
|
- (arch_zone_highest_possible_pfn[i]
|
|
|
|
|
|
+ pr_cont("[mem %#018Lx-%#018Lx]\n",
|
|
|
|
+ (u64)arch_zone_lowest_possible_pfn[i]
|
|
|
|
+ << PAGE_SHIFT,
|
|
|
|
+ ((u64)arch_zone_highest_possible_pfn[i]
|
|
<< PAGE_SHIFT) - 1);
|
|
<< PAGE_SHIFT) - 1);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -5377,15 +5378,16 @@ void __init free_area_init_nodes(unsigned long *max_zone_pfn)
|
|
pr_info("Movable zone start for each node\n");
|
|
pr_info("Movable zone start for each node\n");
|
|
for (i = 0; i < MAX_NUMNODES; i++) {
|
|
for (i = 0; i < MAX_NUMNODES; i++) {
|
|
if (zone_movable_pfn[i])
|
|
if (zone_movable_pfn[i])
|
|
- pr_info(" Node %d: %#010lx\n", i,
|
|
|
|
- zone_movable_pfn[i] << PAGE_SHIFT);
|
|
|
|
|
|
+ pr_info(" Node %d: %#018Lx\n", i,
|
|
|
|
+ (u64)zone_movable_pfn[i] << PAGE_SHIFT);
|
|
}
|
|
}
|
|
|
|
|
|
/* Print out the early node map */
|
|
/* Print out the early node map */
|
|
pr_info("Early memory node ranges\n");
|
|
pr_info("Early memory node ranges\n");
|
|
for_each_mem_pfn_range(i, MAX_NUMNODES, &start_pfn, &end_pfn, &nid)
|
|
for_each_mem_pfn_range(i, MAX_NUMNODES, &start_pfn, &end_pfn, &nid)
|
|
- pr_info(" node %3d: [mem %#010lx-%#010lx]\n", nid,
|
|
|
|
- start_pfn << PAGE_SHIFT, (end_pfn << PAGE_SHIFT) - 1);
|
|
|
|
|
|
+ pr_info(" node %3d: [mem %#018Lx-%#018Lx]\n", nid,
|
|
|
|
+ (u64)start_pfn << PAGE_SHIFT,
|
|
|
|
+ ((u64)end_pfn << PAGE_SHIFT) - 1);
|
|
|
|
|
|
/* Initialise every node */
|
|
/* Initialise every node */
|
|
mminit_verify_pageflags_layout();
|
|
mminit_verify_pageflags_layout();
|