aboutsummaryrefslogtreecommitdiffstats
path: root/mm/sparse.c
diff options
context:
space:
mode:
Diffstat (limited to 'mm/sparse.c')
-rw-r--r--mm/sparse.c21
1 files changed, 9 insertions, 12 deletions
diff --git a/mm/sparse.c b/mm/sparse.c
index 3717ceed4177..5d0cf4540364 100644
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -313,9 +313,8 @@ static void __init check_usemap_section_nr(int nid, unsigned long *usemap)
313 313
314 usemap_nid = sparse_early_nid(__nr_to_section(usemap_snr)); 314 usemap_nid = sparse_early_nid(__nr_to_section(usemap_snr));
315 if (usemap_nid != nid) { 315 if (usemap_nid != nid) {
316 printk(KERN_INFO 316 pr_info("node %d must be removed before remove section %ld\n",
317 "node %d must be removed before remove section %ld\n", 317 nid, usemap_snr);
318 nid, usemap_snr);
319 return; 318 return;
320 } 319 }
321 /* 320 /*
@@ -324,10 +323,8 @@ static void __init check_usemap_section_nr(int nid, unsigned long *usemap)
324 * gather other removable sections for dynamic partitioning. 323 * gather other removable sections for dynamic partitioning.
325 * Just notify un-removable section's number here. 324 * Just notify un-removable section's number here.
326 */ 325 */
327 printk(KERN_INFO "Section %ld and %ld (node %d)", usemap_snr, 326 pr_info("Section %ld and %ld (node %d) have a circular dependency on usemap and pgdat allocations\n",
328 pgdat_snr, nid); 327 usemap_snr, pgdat_snr, nid);
329 printk(KERN_CONT
330 " have a circular dependency on usemap and pgdat allocations\n");
331} 328}
332#else 329#else
333static unsigned long * __init 330static unsigned long * __init
@@ -355,7 +352,7 @@ static void __init sparse_early_usemaps_alloc_node(void *data,
355 usemap = sparse_early_usemaps_alloc_pgdat_section(NODE_DATA(nodeid), 352 usemap = sparse_early_usemaps_alloc_pgdat_section(NODE_DATA(nodeid),
356 size * usemap_count); 353 size * usemap_count);
357 if (!usemap) { 354 if (!usemap) {
358 printk(KERN_WARNING "%s: allocation failed\n", __func__); 355 pr_warn("%s: allocation failed\n", __func__);
359 return; 356 return;
360 } 357 }
361 358
@@ -428,8 +425,8 @@ void __init sparse_mem_maps_populate_node(struct page **map_map,
428 if (map_map[pnum]) 425 if (map_map[pnum])
429 continue; 426 continue;
430 ms = __nr_to_section(pnum); 427 ms = __nr_to_section(pnum);
431 printk(KERN_ERR "%s: sparsemem memory map backing failed " 428 pr_err("%s: sparsemem memory map backing failed some memory will not be available\n",
432 "some memory will not be available.\n", __func__); 429 __func__);
433 ms->section_mem_map = 0; 430 ms->section_mem_map = 0;
434 } 431 }
435} 432}
@@ -456,8 +453,8 @@ static struct page __init *sparse_early_mem_map_alloc(unsigned long pnum)
456 if (map) 453 if (map)
457 return map; 454 return map;
458 455
459 printk(KERN_ERR "%s: sparsemem memory map backing failed " 456 pr_err("%s: sparsemem memory map backing failed some memory will not be available\n",
460 "some memory will not be available.\n", __func__); 457 __func__);
461 ms->section_mem_map = 0; 458 ms->section_mem_map = 0;
462 return NULL; 459 return NULL;
463} 460}