summary refs log tree commit diff
path: root/arch/s390/boot
diff options
context:
space:
mode:
authorVasily Gorbik <gor@linux.ibm.com>2021-06-16 00:36:41 +0200
committerVasily Gorbik <gor@linux.ibm.com>2021-06-18 16:41:22 +0200
commit54f45214522ae74dc23ad262346ce1abbf96b1ed (patch)
treefd4960045f081632475764e5c8c9e6193886d524 /arch/s390/boot
parent87929cae887d9f5ef0d8505f18f6bafe8f7964ba (diff)
downloadlinux-54f45214522ae74dc23ad262346ce1abbf96b1ed.tar.gz
s390/decompressor: correct BOOT_HEAP_SIZE condition
Currently BOOT_HEAP_SIZE is always defined as 0x400000 due to
bogus condition. Use CONFIG_KERNEL_BZIP2 instead of
CONFIG_HAVE_KERNEL_BZIP2 to correct that.

BOOT_HEAP_SIZE of 0x10000 is still good enough for every decompressor
algorithm but bzip2. Actual decompressor memory usage with allyesconfig
is the following:
gzip  0xbc28
bzip2 0x379518
xz    0x7410
lzma  0x3e6c
lzo   0
lz4   0

Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Diffstat (limited to 'arch/s390/boot')
-rw-r--r--arch/s390/boot/compressed/decompressor.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/boot/compressed/decompressor.c b/arch/s390/boot/compressed/decompressor.c
index 3061b11c4d27..cf2571050c68 100644
--- a/arch/s390/boot/compressed/decompressor.c
+++ b/arch/s390/boot/compressed/decompressor.c
@@ -28,7 +28,7 @@ extern char _end[];
 extern unsigned char _compressed_start[];
 extern unsigned char _compressed_end[];
 
-#ifdef CONFIG_HAVE_KERNEL_BZIP2
+#ifdef CONFIG_KERNEL_BZIP2
 #define BOOT_HEAP_SIZE	0x400000
 #else
 #define BOOT_HEAP_SIZE	0x10000