s390/boot: rename HEAP_SIZE due to name collision (1b3e3faf) · Commits · 戴 / test

Change the conflicting macro name in preparation for zlib_inflate hardware support. Link: http://lkml.kernel.org/r/20200103223334.20669-3-zaslonko@linux.ibm.com Signed-off-by:

arch/s390/boot/compressed/decompressor.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -30,13 +30,13 @@ extern unsigned char _compressed_start[];
		extern unsigned char _compressed_end[];

		#ifdef CONFIG_HAVE_KERNEL_BZIP2
		#define HEAP_SIZE 0x400000
		#define BOOT_HEAP_SIZE 0x400000
		#else
		#define HEAP_SIZE 0x10000
		#define BOOT_HEAP_SIZE 0x10000
		#endif

		static unsigned long free_mem_ptr = (unsigned long) _end;
		static unsigned long free_mem_end_ptr = (unsigned long) _end + HEAP_SIZE;
		static unsigned long free_mem_end_ptr = (unsigned long) _end + BOOT_HEAP_SIZE;

		#ifdef CONFIG_KERNEL_GZIP
		#include "../../../../lib/decompress_inflate.c"
		@@ -62,7 +62,7 @@ static unsigned long free_mem_end_ptr = (unsigned long) _end + HEAP_SIZE;
		#include "../../../../lib/decompress_unxz.c"
		#endif

		#define decompress_offset ALIGN((unsigned long)_end + HEAP_SIZE, PAGE_SIZE)
		#define decompress_offset ALIGN((unsigned long)_end + BOOT_HEAP_SIZE, PAGE_SIZE)

		unsigned long mem_safe_offset(void)
		{