Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Fri, 6 Jan 2023 17:23:12 +0100
From:   Heiko Carstens <hca@linux.ibm.com>
To:     Masahiro Yamada <masahiroy@kernel.org>
Cc:     Vasily Gorbik <gor@linux.ibm.com>,
        Alexander Gordeev <agordeev@linux.ibm.com>,
        Christian Borntraeger <borntraeger@linux.ibm.com>,
        Sven Schnelle <svens@linux.ibm.com>,
        linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] s390: fix -Wundef warning for CONFIG_KERNEL_ZSTD
Message-ID: <Y7hK8HIULQ8zeiZ3@osiris>
References: <20230106161024.2373602-1-masahiroy@kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20230106161024.2373602-1-masahiroy@kernel.org>
Precedence: bulk

On Sat, Jan 07, 2023 at 01:10:23AM +0900, Masahiro Yamada wrote:
> Since commit 80b6093b55e3 ("kbuild: add -Wundef to KBUILD_CPPFLAGS
> for W=1 builds"), building with W=1 detects misuse of #(el)if.
> 
>   $ make W=1 ARCH=s390 CROSS_COMPILE=s390x-linux-gnu-
>     [snip]
>   arch/s390/boot/decompressor.c:28:7: warning: "CONFIG_KERNEL_ZSTD" is not defined, evaluates to 0 [-Wundef]
>      28 | #elif CONFIG_KERNEL_ZSTD
>         |       ^~~~~~~~~~~~~~~~~~
> 
> This issue has been hidden because arch/s390/boot/Makefile overwrites
> KBUILD_CFLAGS, dropping -Wundef.
> 
> CONFIG_KERNEL_ZSTD is a bool option. #elif defined() should be used.
> 
> The line #ifdef CONFIG_KERNEL_BZIP2 is fine, but I changed it for
> consistency.
> 
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
> ---
> 
>  arch/s390/boot/decompressor.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Applied, thanks!