From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=l1cQ=EB=vger.kernel.org=linux-kernel-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,
	HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,
	SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no
	version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id E73E0C56201
	for <linux-kernel@archiver.kernel.org>; Mon, 26 Oct 2020 23:58:44 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id B87F020773
	for <linux-kernel@archiver.kernel.org>; Mon, 26 Oct 2020 23:58:44 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1725984AbgJZX6n (ORCPT
        <rfc822;linux-kernel@archiver.kernel.org>);
        Mon, 26 Oct 2020 19:58:43 -0400
Received: from mx2.suse.de ([195.135.220.15]:47890 "EHLO mx2.suse.de"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S2436664AbgJZX5D (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Mon, 26 Oct 2020 19:57:03 -0400
X-Virus-Scanned: by amavisd-new at test-mx.suse.de
Received: from relay2.suse.de (unknown [195.135.221.27])
        by mx2.suse.de (Postfix) with ESMTP id 306D1AC43;
        Mon, 26 Oct 2020 23:57:01 +0000 (UTC)
Received: by lion.mk-sys.cz (Postfix, from userid 1000)
        id C881E60736; Tue, 27 Oct 2020 00:57:00 +0100 (CET)
Date:   Tue, 27 Oct 2020 00:57:00 +0100
From:   Michal Kubecek <mkubecek@suse.cz>
To:     Vasily Gorbik <gor@linux.ibm.com>
Cc:     linux-s390@vger.kernel.org, Joe Perches <joe@perches.com>,
        linux-kernel@vger.kernel.org, Jiri Slaby <jslaby@suse.cz>
Subject: Re: [PATCH 1/1] s390: correct __bootdata / __bootdata_preserved
 macros
Message-ID: <20201026235700.3dga6r5obn7z5cxv@lion.mk-sys.cz>
References: <20201026104811.22ta4pby2chmz4pv@lion.mk-sys.cz>
 <cover.thread-96dc81.your-ad-here.call-01603716370-ext-5478@work.hours>
 <patch-1.thread-96dc81.git-96dc8112cea9.your-ad-here.call-01603716370-ext-5478@work.hours>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
        protocol="application/pgp-signature"; boundary="qcfgs5eg7rfckcnu"
Content-Disposition: inline
In-Reply-To: <patch-1.thread-96dc81.git-96dc8112cea9.your-ad-here.call-01603716370-ext-5478@work.hours>
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


--qcfgs5eg7rfckcnu
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Mon, Oct 26, 2020 at 01:49:08PM +0100, Vasily Gorbik wrote:
> Currently s390 build is broken.
>=20
>   SECTCMP .boot.data
> error: section .boot.data differs between vmlinux and arch/s390/boot/comp=
ressed/vmlinux
> make[2]: *** [arch/s390/boot/section_cmp.boot.data] Error 1
>   SECTCMP .boot.preserved.data
> error: section .boot.preserved.data differs between vmlinux and arch/s390=
/boot/compressed/vmlinux
> make[2]: *** [arch/s390/boot/section_cmp.boot.preserved.data] Error 1
> make[1]: *** [bzImage] Error 2
>=20
> Commit 33def8498fdd ("treewide: Convert macro and uses of __section(foo)
> to __section("foo")") converted all __section(foo) to __section("foo").
> This is wrong for __bootdata / __bootdata_preserved macros which want
> variable names to be a part of intermediate section names .boot.data.<var
> name> and .boot.preserved.data.<var name>. Those sections are later
> sorted by alignment + name and merged together into final .boot.data
> / .boot.preserved.data sections. Those sections must be identical in
> the decompressor and the decompressed kernel (that is checked during
> the build).
>=20
> Fixes: 33def8498fdd ("treewide: Convert macro and uses of __section(foo) =
to __section("foo")")
> Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>

Tested-by: Michal Kubecek <mkubecek@suse.cz>

Thank you,
Michal

> ---
>  arch/s390/include/asm/sections.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>=20
> diff --git a/arch/s390/include/asm/sections.h b/arch/s390/include/asm/sec=
tions.h
> index a996d3990a02..0c2151451ba5 100644
> --- a/arch/s390/include/asm/sections.h
> +++ b/arch/s390/include/asm/sections.h
> @@ -26,14 +26,14 @@ static inline int arch_is_kernel_initmem_freed(unsign=
ed long addr)
>   * final .boot.data section, which should be identical in the decompress=
or and
>   * the decompressed kernel (that is checked during the build).
>   */
> -#define __bootdata(var) __section(".boot.data.var") var
> +#define __bootdata(var) __section(".boot.data." #var) var
> =20
>  /*
>   * .boot.preserved.data is similar to .boot.data, but it is not part of =
the
>   * .init section and thus will be preserved for later use in the decompr=
essed
>   * kernel.
>   */
> -#define __bootdata_preserved(var) __section(".boot.preserved.data.var") =
var
> +#define __bootdata_preserved(var) __section(".boot.preserved.data." #var=
) var
> =20
>  extern unsigned long __sdma, __edma;
>  extern unsigned long __stext_dma, __etext_dma;
> --=20
> 2.25.4

--qcfgs5eg7rfckcnu
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQEzBAABCAAdFiEEWN3j3bieVmp26mKO538sG/LRdpUFAl+XYkcACgkQ538sG/LR
dpWkIQf/ewe8ufeiPuicJmlgaV6TdHL3FAT8qcv6mHaTsLLX7wyxKw5IAjV7MQ5v
qjREkYseptZ88CaoU6Rhzc1iGY2ugIpdQpPRrr/CbvgH5Kaw7AH0Ii9C/60W1CY8
zJl9UPKuOV/s5RiMA1gP0AKTDNVGLk35/GYKh4GnvIIoY1jjxkoaoGqew+jBkCc8
H6bJfChAHqb0YEhiOrB6quwEDbFBmongolgMmpHJ/kenhW/IeOyT1TRDt00jFr6i
rpHMS48r4uhi5M0srNOW71mptisTBR1rjMzz/2maaNv8yntJsEFN3J2RbQ3Z/x1c
TZ7UujMj5rSBT/RjXFwZcjPCp8KxOQ==
=9yg/
-----END PGP SIGNATURE-----

--qcfgs5eg7rfckcnu--