Received-SPF: pass (google.com: domain of linux-kernel+bounces-180922-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
Date: Thu, 16 May 2024 10:51:38 -0000
From: "tip-bot2 for Borislav Petkov" <tip-bot2@linutronix.de>
Sender: tip-bot2@linutronix.de
Reply-to: linux-kernel@vger.kernel.org
To: linux-tip-commits@vger.kernel.org
Subject: [tip: x86/urgent] x86/boot: Add a fallthrough annotation
Cc: Borislav Petkov <bp@suse.de>, "Borislav Petkov (AMD)" <bp@alien8.de>,
 Ingo Molnar <mingo@kernel.org>, x86@kernel.org, linux-kernel@vger.kernel.org
In-Reply-To: <20240516102240.16270-1-bp@kernel.org>
References: <20240516102240.16270-1-bp@kernel.org>
Precedence: bulk
MIME-Version: 1.0
Message-ID: <171585669878.10875.8116182217321169904.tip-bot2@tip-bot2>
Robot-ID: <tip-bot2@linutronix.de>
Robot-Unsubscribe:
 Contact <mailto:tglx@linutronix.de> to get blacklisted from these emails
Precedence: bulk
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

The following commit has been merged into the x86/urgent branch of tip:

Commit-ID:     dd0716c2b87792ebea30864e7ad1df461d4c1525
Gitweb:        https://git.kernel.org/tip/dd0716c2b87792ebea30864e7ad1df461d4=
c1525
Author:        Borislav Petkov <bp@suse.de>
AuthorDate:    Thu, 16 May 2024 12:22:40 +02:00
Committer:     Ingo Molnar <mingo@kernel.org>
CommitterDate: Thu, 16 May 2024 12:46:36 +02:00

x86/boot: Add a fallthrough annotation

Add implicit fallthrough checking to the decompressor code and fix this
warning:

  arch/x86/boot/printf.c: In function =E2=80=98vsprintf=E2=80=99:
  arch/x86/boot/printf.c:248:10: warning: this statement may fall through [-W=
implicit-fallthrough=3D]
    248 |    flags |=3D SMALL;
        |          ^
  arch/x86/boot/printf.c:249:3: note: here
    249 |   case 'X':
        |   ^~~~

This is a patch from three years ago which I found in my trees, thus the
SUSE authorship still.

Signed-off-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20240516102240.16270-1-bp@kernel.org
---
 arch/x86/boot/Makefile | 1 +
 arch/x86/boot/printf.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
index 3cece19..343aef6 100644
--- a/arch/x86/boot/Makefile
+++ b/arch/x86/boot/Makefile
@@ -69,6 +69,7 @@ KBUILD_CFLAGS	:=3D $(REALMODE_CFLAGS) -D_SETUP
 KBUILD_AFLAGS	:=3D $(KBUILD_CFLAGS) -D__ASSEMBLY__
 KBUILD_CFLAGS	+=3D $(call cc-option,-fmacro-prefix-map=3D$(srctree)/=3D)
 KBUILD_CFLAGS	+=3D -fno-asynchronous-unwind-tables
+KBUILD_CFLAGS	+=3D $(CONFIG_CC_IMPLICIT_FALLTHROUGH)
 GCOV_PROFILE :=3D n
 UBSAN_SANITIZE :=3D n
=20
diff --git a/arch/x86/boot/printf.c b/arch/x86/boot/printf.c
index 1237bee..c0ec1dc 100644
--- a/arch/x86/boot/printf.c
+++ b/arch/x86/boot/printf.c
@@ -246,6 +246,7 @@ int vsprintf(char *buf, const char *fmt, va_list args)
=20
 		case 'x':
 			flags |=3D SMALL;
+			fallthrough;
 		case 'X':
 			base =3D 16;
 			break;