diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-19 21:42:29 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-19 21:42:29 +0300 |
commit | 41c14f1ac82cdb1e009d635ffd5ae5dc4cc3f036 (patch) | |
tree | 6fd083382a8e5b3553a695b7927d1fa7940efa17 /arch/x86/boot/printf.c | |
parent | 8dde191aabba42e9c16c8d9c853a72a062db27ee (diff) | |
parent | 9dba9c67e52dbe0978c0e86c994891eba480adf0 (diff) | |
download | linux-41c14f1ac82cdb1e009d635ffd5ae5dc4cc3f036.tar.xz |
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/printf.c')
-rw-r--r-- | arch/x86/boot/printf.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/boot/printf.c b/arch/x86/boot/printf.c index 1237beeb9540..51dc14b714f6 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) case 'x': flags |= SMALL; + fallthrough; case 'X': base = 16; break; @@ -253,6 +254,8 @@ int vsprintf(char *buf, const char *fmt, va_list args) case 'd': case 'i': flags |= SIGN; + break; + case 'u': break; |