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

Commit 2fc1b6f0 authored by liubo's avatar liubo Committed by Steven Rostedt
Browse files

tracing: Add __print_symbolic_u64 to avoid warnings on 32bit machine 



Filesystem, like Btrfs, has some "ULL" macros, and when these macros are passed
to tracepoints'__print_symbolic(), there will be 64->32 truncate WARNINGS during
compiling on 32bit box.

Signed-off-by: default avatarLiu Bo <liubo2009@cn.fujitsu.com>
Link: http://lkml.kernel.org/r/4DACE6E0.7000507@cn.fujitsu.com


Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 3b6cfdb1

include/linux/ftrace_event.h

+12 −0
Original line number Diff line number Diff line
@@ -16,6 +16,11 @@ struct trace_print_flags { 
	const char		*name;

};



struct trace_print_flags_u64 {

	unsigned long long	mask;

	const char		*name;

};



const char *ftrace_print_flags_seq(struct trace_seq *p, const char *delim,

				   unsigned long flags,

				   const struct trace_print_flags *flag_array);
@@ -23,6 +28,13 @@ const char *ftrace_print_flags_seq(struct trace_seq *p, const char *delim, 
const char *ftrace_print_symbols_seq(struct trace_seq *p, unsigned long val,

				     const struct trace_print_flags *symbol_array);



#if BITS_PER_LONG == 32

const char *ftrace_print_symbols_seq_u64(struct trace_seq *p,

					 unsigned long long val,

					 const struct trace_print_flags_u64

								 *symbol_array);

#endif



const char *ftrace_print_hex_seq(struct trace_seq *p,

				 const unsigned char *buf, int len);

include/trace/ftrace.h

+13 −0
Original line number Diff line number Diff line
@@ -205,6 +205,19 @@ 
		ftrace_print_symbols_seq(p, value, symbols);		\

	})



#undef __print_symbolic_u64

#if BITS_PER_LONG == 32

#define __print_symbolic_u64(value, symbol_array...)			\

	({								\

		static const struct trace_print_flags_u64 symbols[] =	\

			{ symbol_array, { -1, NULL } };			\

		ftrace_print_symbols_seq_u64(p, value, symbols);	\

	})

#else

#define __print_symbolic_u64(value, symbol_array...)			\

			__print_symbolic(value, symbol_array)

#endif



#undef __print_hex

#define __print_hex(buf, buf_len) ftrace_print_hex_seq(p, buf, buf_len)

kernel/trace/trace_output.c

+27 −0
Original line number Diff line number Diff line
@@ -353,6 +353,33 @@ ftrace_print_symbols_seq(struct trace_seq *p, unsigned long val, 
}

EXPORT_SYMBOL(ftrace_print_symbols_seq);



#if BITS_PER_LONG == 32

const char *

ftrace_print_symbols_seq_u64(struct trace_seq *p, unsigned long long val,

			 const struct trace_print_flags_u64 *symbol_array)

{

	int i;

	const char *ret = p->buffer + p->len;



	for (i = 0;  symbol_array[i].name; i++) {



		if (val != symbol_array[i].mask)

			continue;



		trace_seq_puts(p, symbol_array[i].name);

		break;

	}



	if (!p->len)

		trace_seq_printf(p, "0x%llx", val);



	trace_seq_putc(p, 0);



	return ret;

}

EXPORT_SYMBOL(ftrace_print_symbols_seq_u64);

#endif



const char *

ftrace_print_hex_seq(struct trace_seq *p, const unsigned char *buf, int buf_len)

{