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

pmladek · pmladek · commit 3bfd34ed362b · 2025-08-04T14:15:14.000+02:00
diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h
@@ -127,6 +127,8 @@
 #define __diag_GCC_8(s)
 #endif
 
+#define __diag_GCC_all(s)	__diag(s)
+
 #define __diag_ignore_all(option, comment) \
 	__diag(__diag_GCC_ignore option)
 
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
@@ -1699,10 +1699,9 @@ char *escaped_string(char *buf, char *end, u8 *addr, struct printf_spec spec,
 	return buf;
 }
 
-#pragma GCC diagnostic push
-#ifndef __clang__
-#pragma GCC diagnostic ignored "-Wsuggest-attribute=format"
-#endif
+__diag_push();
+__diag_ignore(GCC, all, "-Wsuggest-attribute=format",
+	      "Not a valid __printf() conversion candidate.");
 static char *va_format(char *buf, char *end, struct va_format *va_fmt,
 		       struct printf_spec spec)
 {
@@ -1717,7 +1716,7 @@ static char *va_format(char *buf, char *end, struct va_format *va_fmt,
 
 	return buf;
 }
-#pragma GCC diagnostic pop
+__diag_pop();
 
 static noinline_for_stack
 char *uuid_string(char *buf, char *end, const u8 *addr,

Original file line number	Diff line number	Diff line change
`@@ -1699,10 +1699,9 @@ char escaped_string(char buf, char end, u8 addr, struct printf_spec spec,`
`1699`	`1699`	`return buf;`
`1700`	`1700`	`}`
`1701`	`1701`
`1702`		`-#pragma GCC diagnostic push`
`1703`		`-#ifndef __clang__`
`1704`		`-#pragma GCC diagnostic ignored "-Wsuggest-attribute=format"`
`1705`		`-#endif`
	`1702`	`+__diag_push();`
	`1703`	`+__diag_ignore(GCC, all, "-Wsuggest-attribute=format",`
	`1704`	`+ "Not a valid __printf() conversion candidate.");`
`1706`	`1705`	`static char va_format(char buf, char end, struct va_format va_fmt,`
`1707`	`1706`	`struct printf_spec spec)`
`1708`	`1707`	`{`
`@@ -1717,7 +1716,7 @@ static char va_format(char buf, char end, struct va_format va_fmt,`
`1717`	`1716`
`1718`	`1717`	`return buf;`
`1719`	`1718`	`}`
`1720`		`-#pragma GCC diagnostic pop`
	`1719`	`+__diag_pop();`
`1721`	`1720`
`1722`	`1721`	`static noinline_for_stack`
`1723`	`1722`	`char uuid_string(char buf, char end, const u8 addr,`