linux-kernel - Re: [PATCH v3 2/6] s390/boot: Rename HEAP

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <d6a11637-600d-5435-f2c8-bb74a6dcb4e8@de.ibm.com>
Date:   Tue, 7 Jan 2020 15:50:14 +0100
From:   Christian Borntraeger <borntraeger@...ibm.com>
To:     Mikhail Zaslonko <zaslonko@...ux.ibm.com>,
        Andrew Morton <akpm@...ux-foundation.org>,
        Chris Mason <clm@...com>, Josef Bacik <josef@...icpanda.com>,
        David Sterba <dsterba@...e.com>
Cc:     Richard Purdie <rpurdie@...ys.net>,
        Heiko Carstens <heiko.carstens@...ibm.com>,
        Vasily Gorbik <gor@...ux.ibm.com>,
        Eduard Shishkin <edward6@...ux.ibm.com>,
        Ilya Leoshkevich <iii@...ux.ibm.com>,
        linux-s390@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH v3 2/6] s390/boot: Rename HEAP_SIZE due to name collision



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@...ux.ibm.com>

Reviewed-by: Christian Borntraeger <borntraeger@...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)
>  {
>