Commit 496e59cc authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky

s390/topology: reduce number of printks

Merge the seven printks within topology_init_early to a single one.
With an early boot console this avoids printing six lines each
containing only a single character.
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 00de54c8
...@@ -461,7 +461,6 @@ static void __init alloc_masks(struct sysinfo_15_1_x *info, ...@@ -461,7 +461,6 @@ static void __init alloc_masks(struct sysinfo_15_1_x *info,
void __init topology_init_early(void) void __init topology_init_early(void)
{ {
struct sysinfo_15_1_x *info; struct sysinfo_15_1_x *info;
int i;
set_sched_topology(s390_topology); set_sched_topology(s390_topology);
if (!MACHINE_HAS_TOPOLOGY) if (!MACHINE_HAS_TOPOLOGY)
...@@ -469,10 +468,9 @@ void __init topology_init_early(void) ...@@ -469,10 +468,9 @@ void __init topology_init_early(void)
tl_info = memblock_virt_alloc(sizeof(*tl_info), PAGE_SIZE); tl_info = memblock_virt_alloc(sizeof(*tl_info), PAGE_SIZE);
info = tl_info; info = tl_info;
store_topology(info); store_topology(info);
pr_info("The CPU configuration topology of the machine is:"); pr_info("The CPU configuration topology of the machine is: %d %d %d %d %d %d / %d\n",
for (i = 0; i < TOPOLOGY_NR_MAG; i++) info->mag[0], info->mag[1], info->mag[2], info->mag[3],
printk(KERN_CONT " %d", info->mag[i]); info->mag[4], info->mag[5], info->mnest);
printk(KERN_CONT " / %d\n", info->mnest);
alloc_masks(info, &socket_info, 1); alloc_masks(info, &socket_info, 1);
alloc_masks(info, &book_info, 2); alloc_masks(info, &book_info, 2);
alloc_masks(info, &drawer_info, 3); alloc_masks(info, &drawer_info, 3);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment