From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:13148 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728189AbgAGOuX (ORCPT ); Tue, 7 Jan 2020 09:50:23 -0500 Received: from pps.filterd (m0098396.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 007EnSr9068451 for ; Tue, 7 Jan 2020 09:50:22 -0500 Received: from e06smtp04.uk.ibm.com (e06smtp04.uk.ibm.com [195.75.94.100]) by mx0a-001b2d01.pphosted.com with ESMTP id 2xb92n9x41-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 07 Jan 2020 09:50:22 -0500 Received: from localhost by e06smtp04.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 7 Jan 2020 14:50:20 -0000 Subject: Re: [PATCH v3 2/6] s390/boot: Rename HEAP_SIZE due to name collision References: <20200103223334.20669-1-zaslonko@linux.ibm.com> <20200103223334.20669-3-zaslonko@linux.ibm.com> From: Christian Borntraeger Date: Tue, 7 Jan 2020 15:50:14 +0100 MIME-Version: 1.0 In-Reply-To: <20200103223334.20669-3-zaslonko@linux.ibm.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Message-Id: Sender: linux-s390-owner@vger.kernel.org List-ID: To: Mikhail Zaslonko , Andrew Morton , Chris Mason , Josef Bacik , David Sterba Cc: Richard Purdie , Heiko Carstens , Vasily Gorbik , Eduard Shishkin , Ilya Leoshkevich , linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org 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 Reviewed-by: Christian Borntraeger > --- > 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) > { >