Commit 3bfd34ed authored by Petr Mladek's avatar Petr Mladek
Browse files

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

parents af54a3a1 b5960a06

include/linux/compiler-gcc.h

+2 −0
Original line number Diff line number Diff line
@@ -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)

lib/vsprintf.c

+4 −5
Original line number Diff line number Diff line
@@ -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,