Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce8eb2bf authored by Steven Rostedt's avatar Steven Rostedt
Browse files

tracing: fix printk format specifier 



Impact: clean up

The offsetof and sizeof are of type size_t, and instead of typecasting
them to unsigned int for printk formatting, one could just use %zu.

Reported-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarSteven Rostedt <srostedt@redhat.com>
parent 157587d7

kernel/trace/trace_events.c

+6 −7
Original line number Diff line number Diff line
@@ -338,8 +338,7 @@ event_enable_write(struct file *filp, const char __user *ubuf, size_t cnt, 


#undef FIELD

#define FIELD(type, name)						\

	#type, #name, (unsigned int)offsetof(typeof(field), name),	\

		(unsigned int)sizeof(field.name)

	#type, #name, offsetof(typeof(field), name), sizeof(field.name)



static int trace_write_header(struct trace_seq *s)

{
@@ -347,11 +346,11 @@ static int trace_write_header(struct trace_seq *s) 


	/* struct trace_entry */

	return trace_seq_printf(s,

				"\tfield:%s %s;\toffset:%u;\tsize:%u;\n"

				"\tfield:%s %s;\toffset:%u;\tsize:%u;\n"

				"\tfield:%s %s;\toffset:%u;\tsize:%u;\n"

				"\tfield:%s %s;\toffset:%u;\tsize:%u;\n"

				"\tfield:%s %s;\toffset:%u;\tsize:%u;\n"

				"\tfield:%s %s;\toffset:%zu;\tsize:%zu;\n"

				"\tfield:%s %s;\toffset:%zu;\tsize:%zu;\n"

				"\tfield:%s %s;\toffset:%zu;\tsize:%zu;\n"

				"\tfield:%s %s;\toffset:%zu;\tsize:%zu;\n"

				"\tfield:%s %s;\toffset:%zu;\tsize:%zu;\n"

				"\n",

				FIELD(unsigned char, type),

				FIELD(unsigned char, flags),