diff mbox series

[UNSTABLE,1/3] s390/decompressor: correct BOOT_HEAP_SIZE condition

Message ID 20210624205347.28144-2-dimitri.ledkov@canonical.com
State New
Headers show
Series use ZSTD to compress s390 kernels | expand

Commit Message

Dimitri John Ledkov June 24, 2021, 8:53 p.m. UTC 
From: Vasily Gorbik <gor@linux.ibm.com>

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>
(cherry picked from commit 54f45214522ae74dc23ad262346ce1abbf96b1ed linux-next)
BugLink: https://bugs.launchpad.net/bugs/1931725
Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
---
 arch/s390/boot/compressed/decompressor.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox series

Patch

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