Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp4231762ybl; Mon, 9 Dec 2019 07:31:55 -0800 (PST) X-Google-Smtp-Source: APXvYqx/2ZSN9vfTVyfbJhK21djQ549mVxRNjOUpU6FMddVutLACF2HHeGPgVQBs6M4JawrvdN6n X-Received: by 2002:a54:4482:: with SMTP id v2mr23192054oiv.0.1575905515286; Mon, 09 Dec 2019 07:31:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575905515; cv=none; d=google.com; s=arc-20160816; b=Bb0ilkX1BSrpiVKrhQsAY3ekzIiXhEoljxjigX4BBFw6DmgPJDDu6YLnAyobv2QP6d MAmwH7AYjlSSja0X0/lLVVTZIBIMbOjFrhByz2rvdy27ek25QQXRaryOus1vNeH4Gv4p YAqRB8e2fz1YKuCsmQPzuT5h60dzkxE6jwEyjZA/687g78MGP/GvX2kcOmJfO7g6p1Bf Cyy7pf2h70ro2CQOIB4Qq349+r4w8bZcsPLq+oUC6aKG2qciGrw01xPa/dtdjN4fM+AL kYb5q2YaTM3J36WmF3fhDuZxI9aZkkADixMoa+IcmwPeBl7pV/bpyVtcDQ4iT2LspBzr PWWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:references:in-reply-to:date :subject:cc:to:from; bh=CG0DNgr8EK4IrX3R29vB6Wp/gTzR4B2bhK+6rAjVC4E=; b=ofSVsxGuZpMJC8sQn0+AsdvTZP/utGm8nQqS462m/2a+iboVZu/AeG6YP48M5RoGtw E2tBWUBdSNowF/IyXw4t3E//TUfOVSrQ8oEAS5o3+EdHPDrElWHtbUJZbHq9XWX6Lw2j CzwuY6vsd1L9oUVwvXkF0SeLozaeAggMv2DOwAHqJDikVDMFmDhU4w1bQNyyuYDr6c7x NLZgAEUcLJvts9zabw/k7SNXsllXr9QSpD2naMNriQsuRQeL95chRBbPAMRJvTHbnadt ow7Cym3Qrru2Ub9LIR0avZHYtygnZZkE6FfcHodeY5DvAcoZUmczgr7APxC4m8Rwdacb HpOQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 65si11849834otw.256.2019.12.09.07.31.40; Mon, 09 Dec 2019 07:31:55 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726950AbfLIPaU (ORCPT + 99 others); Mon, 9 Dec 2019 10:30:20 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:9398 "EHLO mx0b-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726584AbfLIP36 (ORCPT ); Mon, 9 Dec 2019 10:29:58 -0500 Received: from pps.filterd (m0127361.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id xB9FStTX122797 for ; Mon, 9 Dec 2019 10:29:57 -0500 Received: from e06smtp01.uk.ibm.com (e06smtp01.uk.ibm.com [195.75.94.97]) by mx0a-001b2d01.pphosted.com with ESMTP id 2wsmft26wq-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 09 Dec 2019 10:29:56 -0500 Received: from localhost by e06smtp01.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 9 Dec 2019 15:29:54 -0000 Received: from b06cxnps3075.portsmouth.uk.ibm.com (9.149.109.195) by e06smtp01.uk.ibm.com (192.168.101.131) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Mon, 9 Dec 2019 15:29:51 -0000 Received: from d06av23.portsmouth.uk.ibm.com (d06av23.portsmouth.uk.ibm.com [9.149.105.59]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id xB9FToVD61472954 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 9 Dec 2019 15:29:50 GMT Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5C4CEA4040; Mon, 9 Dec 2019 15:29:50 +0000 (GMT) Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 05A83A4053; Mon, 9 Dec 2019 15:29:50 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by d06av23.portsmouth.uk.ibm.com (Postfix) with ESMTP; Mon, 9 Dec 2019 15:29:49 +0000 (GMT) From: Mikhail Zaslonko To: Andrew Morton , Chris Mason , Josef Bacik , David Sterba Cc: Richard Purdie , Heiko Carstens , Vasily Gorbik , Christian Borntraeger , Eduard Shishkin , linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, zaslonko@linux.ibm.com Subject: [PATCH v2 2/6] s390/boot: Rename HEAP_SIZE due to name collision Date: Mon, 9 Dec 2019 16:29:44 +0100 X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191209152948.37080-1-zaslonko@linux.ibm.com> References: <20191209152948.37080-1-zaslonko@linux.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 19120915-4275-0000-0000-0000038D5121 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19120915-4276-0000-0000-000038A0FF14 Message-Id: <20191209152948.37080-3-zaslonko@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.95,18.0.572 definitions=2019-12-09_04:2019-12-09,2019-12-09 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 bulkscore=0 phishscore=0 lowpriorityscore=0 clxscore=1015 mlxlogscore=874 adultscore=0 malwarescore=0 priorityscore=1501 suspectscore=2 mlxscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-1910280000 definitions=main-1912090135 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Change the conflicting macro name in preparation for zlib_inflate hardware support. Signed-off-by: Mikhail Zaslonko --- 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) { -- 2.17.1