From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 19 May 2024 18:42:29 +0000 (-0700)
Subject: Merge tag 'x86-urgent-2024-05-18' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v6.10-rc5-pxa1908~284
X-Git-Url: https://git.dujemihanovic.xyz/?a=commitdiff_plain;h=41c14f1ac82cdb1e009d635ffd5ae5dc4cc3f036;p=linux.git

Merge tag 'x86-urgent-2024-05-18' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 fixes from Ingo Molnar:

 - Fix a NOP-patching bug that resulted in valid but suboptimal
   NOP sequences in certain cases

 - Fix build warnings related to fall-through control flow

* tag 'x86-urgent-2024-05-18' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/alternatives: Use the correct length when optimizing NOPs
  x86/boot: Address clang -Wimplicit-fallthrough in vsprintf()
  x86/boot: Add a fallthrough annotation
---

41c14f1ac82cdb1e009d635ffd5ae5dc4cc3f036
diff --cc arch/x86/boot/Makefile
index 1cf24ff6acac,343aef6d752f..9cc0ff6e9067
--- a/arch/x86/boot/Makefile
+++ b/arch/x86/boot/Makefile
@@@ -56,6 -69,9 +56,7 @@@ KBUILD_CFLAGS	:= $(REALMODE_CFLAGS) -D_
  KBUILD_AFLAGS	:= $(KBUILD_CFLAGS) -D__ASSEMBLY__
  KBUILD_CFLAGS	+= $(call cc-option,-fmacro-prefix-map=$(srctree)/=)
  KBUILD_CFLAGS	+= -fno-asynchronous-unwind-tables
+ KBUILD_CFLAGS	+= $(CONFIG_CC_IMPLICIT_FALLTHROUGH)
 -GCOV_PROFILE := n
 -UBSAN_SANITIZE := n
  
  $(obj)/bzImage: asflags-y  := $(SVGA_MODE)