]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
s390: fix -Wundef warning for CONFIG_KERNEL_ZSTD
authorMasahiro Yamada <masahiroy@kernel.org>
Fri, 6 Jan 2023 16:10:23 +0000 (01:10 +0900)
committerHeiko Carstens <hca@linux.ibm.com>
Mon, 9 Jan 2023 13:30:36 +0000 (14:30 +0100)
commitf993d24a948d22710148dae2c48b8a87155f6cb9
tree22151200780067f0a49166466a7036c58ff70c35
parenta494398bde273143c2352dd373cad8211f7d94b2
s390: fix -Wundef warning for CONFIG_KERNEL_ZSTD

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>
Link: https://lore.kernel.org/r/20230106161024.2373602-1-masahiroy@kernel.org
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
arch/s390/boot/decompressor.c