diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-19 11:42:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-19 11:42:29 -0700 |
| commit | 41c14f1ac82cdb1e009d635ffd5ae5dc4cc3f036 (patch) | |
| tree | 6fd083382a8e5b3553a695b7927d1fa7940efa17 /arch/x86/boot/Makefile | |
| parent | 8dde191aabba42e9c16c8d9c853a72a062db27ee (diff) | |
| parent | 9dba9c67e52dbe0978c0e86c994891eba480adf0 (diff) | |
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
Diffstat (limited to 'arch/x86/boot/Makefile')
| -rw-r--r-- | arch/x86/boot/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile index 1cf24ff6acac..9cc0ff6e9067 100644 --- a/arch/x86/boot/Makefile +++ b/arch/x86/boot/Makefile @@ -56,6 +56,7 @@ KBUILD_CFLAGS := $(REALMODE_CFLAGS) -D_SETUP 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) $(obj)/bzImage: asflags-y := $(SVGA_MODE) |