Commit 20f6e03a authored Mar 15, 2016 by Vlastimil Babka Committed by Linus Torvalds Mar 15, 2016

tracepoints: move trace_print_flags definitions to tracepoint-defs.h



The following patch will need to declare array of struct
trace_print_flags in a header.  To prevent this header from pulling in
all of RCU through trace_events.h, move the struct
trace_print_flags{_64} definitions to the new lightweight
tracepoint-defs.h header.

Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
Acked-by: David Rientjes <rientjes@google.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Sasha Levin <sasha.levin@oracle.com>
Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Michal Hocko <mhocko@suse.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent ebded027

include/linux/trace_events.h

+0 −10

Original line number	Diff line number	Diff line
		@@ -15,16 +15,6 @@ struct tracer;
		struct dentry;
		struct bpf_prog;

		struct trace_print_flags {
		unsigned long mask;
		const char *name;
		};

		struct trace_print_flags_u64 {
		unsigned long long mask;
		const char *name;
		};

		const char trace_print_flags_seq(struct trace_seq p, const char *delim,
		unsigned long flags,
		const struct trace_print_flags *flag_array);

include/linux/tracepoint-defs.h

+12 −2

Original line number	Diff line number	Diff line
		@@ -3,13 +3,23 @@

		/*
		* File can be included directly by headers who only want to access
		* tracepoint->key to guard out of line trace calls. Otherwise
		* linux/tracepoint.h should be used.
		* tracepoint->key to guard out of line trace calls, or the definition of
		* trace_print_flags{_u64}. Otherwise linux/tracepoint.h should be used.
		*/

		#include <linux/atomic.h>
		#include <linux/static_key.h>

		struct trace_print_flags {
		unsigned long mask;
		const char *name;
		};

		struct trace_print_flags_u64 {
		unsigned long long mask;
		const char *name;
		};

		struct tracepoint_func {
		void *func;
		void *data;

Admin message