Commit afaffac3 authored by Corentin Labbe's avatar Corentin Labbe Committed by David S. Miller

sparc: Set "ARCH: sunxx" information on the same line

While checking boot log from SPARC qemu, I saw that the "ARCH: sunxx"
information was split on two different line.
This patchs merge both line together.
In the meantime, thoses information need to be printed via pr_info
since printk print them by default via the warning loglevel.
Signed-off-by: default avatarCorentin Labbe <clabbe@baylibre.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0ff70f62
......@@ -310,25 +310,24 @@ void __init setup_arch(char **cmdline_p)
register_console(&prom_early_console);
printk("ARCH: ");
switch(sparc_cpu_model) {
case sun4m:
printk("SUN4M\n");
pr_info("ARCH: SUN4M\n");
break;
case sun4d:
printk("SUN4D\n");
pr_info("ARCH: SUN4D\n");
break;
case sun4e:
printk("SUN4E\n");
pr_info("ARCH: SUN4E\n");
break;
case sun4u:
printk("SUN4U\n");
pr_info("ARCH: SUN4U\n");
break;
case sparc_leon:
printk("LEON\n");
pr_info("ARCH: LEON\n");
break;
default:
printk("UNKNOWN!\n");
pr_info("ARCH: UNKNOWN!\n");
break;
}
......
......@@ -642,9 +642,9 @@ void __init setup_arch(char **cmdline_p)
register_console(&prom_early_console);
if (tlb_type == hypervisor)
printk("ARCH: SUN4V\n");
pr_info("ARCH: SUN4V\n");
else
printk("ARCH: SUN4U\n");
pr_info("ARCH: SUN4U\n");
#ifdef CONFIG_DUMMY_CONSOLE
conswitchp = &dummy_con;
......
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