]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
s390/decompressor: correct BOOT_HEAP_SIZE condition
authorVasily Gorbik <gor@linux.ibm.com>
Tue, 15 Jun 2021 22:36:41 +0000 (00:36 +0200)
committerVasily Gorbik <gor@linux.ibm.com>
Fri, 18 Jun 2021 14:41:22 +0000 (16:41 +0200)
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>
arch/s390/boot/compressed/decompressor.c

index 3061b11c4d27f49a61e13173b793e3e58b6a12d1..cf2571050c6866edbef5d927fc6775b33540b6d1 100644 (file)
@@ -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