diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2017-02-02 12:33:20 +0300 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2017-02-08 16:13:20 +0300 |
| commit | 02407baaebdef86571e4e939ddbd3b32d9b5d389 (patch) | |
| tree | 3389599af369faa22c2731947bde7714cad1ba66 /arch/s390 | |
| parent | d5ab7a34f9bbad54f89b812e6b0d2d898f9433db (diff) | |
| download | linux-02407baaebdef86571e4e939ddbd3b32d9b5d389.tar.xz | |
s390/sclp: don't add new lines to each printed string
The early vt220 sclp printk code added an extra new line to each
printed multi-line text. If used for the early sclp console this will
lead to numerous extra new lines. Therefore get rid of this semantic
and require that each to be printed string contains a line feed
character if a new line is wanted.
Reviewed-by: Peter Oberparleiter <oberpar@linux.vnet.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/kernel/als.c | 7 | ||||
| -rw-r--r-- | arch/s390/kernel/swsusp.S | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/arch/s390/kernel/als.c b/arch/s390/kernel/als.c index 0b3a06f05f90..14769eb52a33 100644 --- a/arch/s390/kernel/als.c +++ b/arch/s390/kernel/als.c @@ -41,6 +41,7 @@ static void __init print_machine_type(void) get_cpu_id(&id); u16_to_hex(type_str, id.machine); strcat(mach_str, type_str); + strcat(mach_str, "\n"); sclp_early_printk(mach_str); } @@ -79,6 +80,7 @@ static void __init print_missing_facilities(void) * z/VM adds a four character prefix. */ if (strlen(als_str) > 70) { + strcat(als_str, "\n"); sclp_early_printk(als_str); *als_str = '\0'; } @@ -87,13 +89,14 @@ static void __init print_missing_facilities(void) first = 0; } } + strcat(als_str, "\n"); sclp_early_printk(als_str); - sclp_early_printk("See Principles of Operations for facility bits"); + sclp_early_printk("See Principles of Operations for facility bits\n"); } static void __init facility_mismatch(void) { - sclp_early_printk("The Linux kernel requires more recent processor hardware"); + sclp_early_printk("The Linux kernel requires more recent processor hardware\n"); print_machine_type(); print_missing_facilities(); disabled_wait(0x8badcccc); diff --git a/arch/s390/kernel/swsusp.S b/arch/s390/kernel/swsusp.S index 6c56fb89f553..6bebc935e9c2 100644 --- a/arch/s390/kernel/swsusp.S +++ b/arch/s390/kernel/swsusp.S @@ -273,7 +273,7 @@ restore_registers: .Ldisabled_wait_31: .long 0x000a0000,0x00000000 .Lpanic_string: - .asciz "Resume not possible because suspend CPU is no longer available" + .asciz "Resume not possible because suspend CPU is no longer available\n" .align 8 .Lrestart_diag308_psw: .long 0x00080000,0x80000000 |