superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'for-6.15-printf-attribute' into for-linus

pull/1314/head
Petr Mladek 2025-08-04 14:15:14 +02:00
parent af54a3a151 b5960a06b9
commit 3bfd34ed36
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/compiler-gcc.h
View File

@ -127,6 +127,8 @@
#define __diag_GCC_8(s) #define __diag_GCC_8(s)
#endif #endif
#define __diag_GCC_all(s) __diag(s)
#define __diag_ignore_all(option, comment) \ #define __diag_ignore_all(option, comment) \
__diag(__diag_GCC_ignore option) __diag(__diag_GCC_ignore option)

9
lib/vsprintf.c
View File

@ -1699,10 +1699,9 @@ char *escaped_string(char *buf, char *end, u8 *addr, struct printf_spec spec,
return buf; return buf;
} }
#pragma GCC diagnostic push __diag_push();
#ifndef __clang__ __diag_ignore(GCC, all, "-Wsuggest-attribute=format",
#pragma GCC diagnostic ignored "-Wsuggest-attribute=format" "Not a valid __printf() conversion candidate.");
#endif
static char *va_format(char *buf, char *end, struct va_format *va_fmt, static char *va_format(char *buf, char *end, struct va_format *va_fmt,
struct printf_spec spec) struct printf_spec spec)
{ {
@ -1717,7 +1716,7 @@ static char *va_format(char *buf, char *end, struct va_format *va_fmt,
return buf; return buf;
} }
#pragma GCC diagnostic pop __diag_pop();
static noinline_for_stack static noinline_for_stack
char *uuid_string(char *buf, char *end, const u8 *addr, char *uuid_string(char *buf, char *end, const u8 *addr,