From: Vasily Gorbik <gor@linux.ibm.com>
Date: Tue, 15 Jun 2021 22:36:41 +0000 (+0200)
Subject: s390/decompressor: correct BOOT_HEAP_SIZE condition
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=54f45214522ae74dc23ad262346ce1abbf96b1ed;p=linux.git

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>
---

diff --git a/arch/s390/boot/compressed/decompressor.c b/arch/s390/boot/compressed/decompressor.c
index 3061b11c4d27f..cf2571050c686 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