Merge tag 'x86-urgent-2024-05-18' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 19 May 2024 18:42:29 +0000 (11:42 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 19 May 2024 18:42:29 +0000 (11:42 -0700)
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

1  2 
arch/x86/boot/Makefile

index 1cf24ff6acac024aaed08118711991779d5bd867,343aef6d752ff0dd325a86bb97cd08a8c20a5396..9cc0ff6e9067d574488a35573eff4d0f8449e398
@@@ -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
 -GCOV_PROFILE := n
 -UBSAN_SANITIZE := n
+ KBUILD_CFLAGS += $(CONFIG_CC_IMPLICIT_FALLTHROUGH)
  
  $(obj)/bzImage: asflags-y  := $(SVGA_MODE)