diff options
| author | Heiko Carstens <hca@linux.ibm.com> | 2023-01-17 19:12:39 +0100 |
|---|---|---|
| committer | Heiko Carstens <hca@linux.ibm.com> | 2023-01-17 19:12:39 +0100 |
| commit | 706a91be38837451977491aa7465e98edf6d35d8 (patch) | |
| tree | 40bf41ed25edf68ec8138629b7820779ec79a29b /arch/s390/boot | |
| parent | ebc872d645e581a4774c36bc394f6246275e1547 (diff) | |
| parent | 41e1992665a2701fa025a8b76970c43b4148446f (diff) | |
| download | linux-706a91be38837451977491aa7465e98edf6d35d8.tar.gz linux-706a91be38837451977491aa7465e98edf6d35d8.tar.bz2 linux-706a91be38837451977491aa7465e98edf6d35d8.zip | |
Merge branch 'fixes' into features
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Diffstat (limited to 'arch/s390/boot')
| -rw-r--r-- | arch/s390/boot/decompressor.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/boot/decompressor.c b/arch/s390/boot/decompressor.c index 4c8c82a951b7..090621b98d95 100644 --- a/arch/s390/boot/decompressor.c +++ b/arch/s390/boot/decompressor.c @@ -24,9 +24,9 @@ #define memmove memmove #define memzero(s, n) memset((s), 0, (n)) -#ifdef CONFIG_KERNEL_BZIP2 +#if defined(CONFIG_KERNEL_BZIP2) #define BOOT_HEAP_SIZE 0x400000 -#elif CONFIG_KERNEL_ZSTD +#elif defined(CONFIG_KERNEL_ZSTD) #define BOOT_HEAP_SIZE 0x30000 #else #define BOOT_HEAP_SIZE 0x10000 |