Re: [PATCH v3 2/6] s390/boot: Rename HEAP_SIZE due to name collision

Christian Borntraeger
2020-01-07T14:50:23Z

On 03.01.20 23:33, Mikhail Zaslonko wrote:
> Change the conflicting macro name in preparation for zlib_inflate
> hardware support.
>
> Signed-off-by: Mikhail Zaslonko <zaslonko@linux.ibm.com>

Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>

> ---
> arch/s390/boot/compressed/decompressor.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/s390/boot/compressed/decompressor.c b/arch/s390/boot/compressed/decompressor.c
> index 45046630c56a..368fd372c875 100644
> --- a/arch/s390/boot/compressed/decompressor.c
> +++ b/arch/s390/boot/compressed/decompressor.c
> @@ -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)
> {
>