Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/s390/kernel/topology.c

+3 −5
Original line number Diff line number Diff line
@@ -461,7 +461,6 @@ static void __init alloc_masks(struct sysinfo_15_1_x *info, 
void __init topology_init_early(void)

{

	struct sysinfo_15_1_x *info;

	int i;



	set_sched_topology(s390_topology);

	if (!MACHINE_HAS_TOPOLOGY)
@@ -469,10 +468,9 @@ void __init topology_init_early(void) 
	tl_info = memblock_virt_alloc(sizeof(*tl_info), PAGE_SIZE);

	info = tl_info;

	store_topology(info);

	pr_info("The CPU configuration topology of the machine is:");

	for (i = 0; i < TOPOLOGY_NR_MAG; i++)

		printk(KERN_CONT " %d", info->mag[i]);

	printk(KERN_CONT " / %d\n", info->mnest);

	pr_info("The CPU configuration topology of the machine is: %d %d %d %d %d %d / %d\n",

		info->mag[0], info->mag[1], info->mag[2], info->mag[3],

		info->mag[4], info->mag[5], info->mnest);

	alloc_masks(info, &socket_info, 1);

	alloc_masks(info, &book_info, 2);

	alloc_masks(info, &drawer_info, 3);