diff options
| author |   Vasily Gorbik <gor@linux.ibm.com> | 2018-07-25 15:01:11 +0200 |
|---|---|---|
| committer |   Martin Schwidefsky <schwidefsky@de.ibm.com> | 2018-10-09 11:21:05 +0200 |
| commit | 7516fc11e44e73f1fcf8a3808dd88f82142e6585 (patch) | |
| tree | 61d2831bd787831b2bd91ed1c3f9e0b248b46e6d /arch/s390/boot/startup.c | |
| parent | s390: rescue initrd as early as possible (diff) | |
| download | linux-dev-7516fc11e44e73f1fcf8a3808dd88f82142e6585.tar.xz linux-dev-7516fc11e44e73f1fcf8a3808dd88f82142e6585.zip | |
s390/decompressor: clean up and rename compressed/misc.c
Since compressed/misc.c is conditionally compiled move error reporting
code to boot/main.c. With that being done compressed/misc.c has no
"miscellaneous" functions left and is all about plain decompression
now. Rename it accordingly.
Reviewed-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/boot/startup.c')
| -rw-r--r-- | arch/s390/boot/startup.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/s390/boot/startup.c b/arch/s390/boot/startup.c index 5aeac7564e67..81199ca4a513 100644 --- a/arch/s390/boot/startup.c +++ b/arch/s390/boot/startup.c @@ -1,9 +1,19 @@ // SPDX-License-Identifier: GPL-2.0 #include <linux/string.h> #include <asm/setup.h> +#include <asm/sclp.h> #include "compressed/decompressor.h" #include "boot.h" +void error(char *x) +{ + sclp_early_printk("\n\n"); + sclp_early_printk(x); + sclp_early_printk("\n\n -- System halted"); + + disabled_wait(0xdeadbeef); +} + #ifdef CONFIG_KERNEL_UNCOMPRESSED unsigned long mem_safe_offset(void) { |