Merge tag 'trace-v4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace (84bd8d33) · Commits · 戴 / test

Pull tracing fix from Steven Rostedt: "Fix tick_stop tracepoint symbols for user export. Luiz Capitulino noticed that the tick_stop tracepoint wasn't being parsed properly by the tracing user space tools. This was due to the TRACE_DEFINE_ENUM() being set to a define, when it should have been set to the enum itself. The define was of the MASK that used the BIT to shift. The BIT was the enum and by adding that, everything gets converted nicely. The MASK is still kept just in case it gets converted to an enum in the future" * tag 'trace-v4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: tracing: Fix tick_stop tracepoint symbols for user export

include/trace/events/timer.h

+11 −3

Original line number	Diff line number	Diff line
		@@ -330,24 +330,32 @@ TRACE_EVENT(itimer_expire,
		#ifdef CONFIG_NO_HZ_COMMON

		#define TICK_DEP_NAMES \
		tick_dep_name(NONE) \
		tick_dep_mask_name(NONE) \
		tick_dep_name(POSIX_TIMER) \
		tick_dep_name(PERF_EVENTS) \
		tick_dep_name(SCHED) \
		tick_dep_name_end(CLOCK_UNSTABLE)

		#undef tick_dep_name
		#undef tick_dep_mask_name
		#undef tick_dep_name_end

		#define tick_dep_name(sdep) TRACE_DEFINE_ENUM(TICK_DEP_MASK_##sdep);
		#define tick_dep_name_end(sdep) TRACE_DEFINE_ENUM(TICK_DEP_MASK_##sdep);
		/* The MASK will convert to their bits and they need to be processed too */
		#define tick_dep_name(sdep) TRACE_DEFINE_ENUM(TICK_DEP_BIT_##sdep); \
		TRACE_DEFINE_ENUM(TICK_DEP_MASK_##sdep);
		#define tick_dep_name_end(sdep) TRACE_DEFINE_ENUM(TICK_DEP_BIT_##sdep); \
		TRACE_DEFINE_ENUM(TICK_DEP_MASK_##sdep);
		/* NONE only has a mask defined for it */
		#define tick_dep_mask_name(sdep) TRACE_DEFINE_ENUM(TICK_DEP_MASK_##sdep);

		TICK_DEP_NAMES

		#undef tick_dep_name
		#undef tick_dep_mask_name
		#undef tick_dep_name_end

		#define tick_dep_name(sdep) { TICK_DEP_MASK_##sdep, #sdep },
		#define tick_dep_mask_name(sdep) { TICK_DEP_MASK_##sdep, #sdep },
		#define tick_dep_name_end(sdep) { TICK_DEP_MASK_##sdep, #sdep }

		#define show_tick_dep_name(val) \

Admin message