Merge tag 'trace-v4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

Pull tracing fixes from Steven Rostedt: "Three minor updates - Use the new GFP_RETRY_MAYFAIL to be more aggressive in allocating memory for the ring buffer without causing OOMs - Fix a memory leak in adding and removing instances - Add __rcu annotation to be able to debug RCU usage of function tracing a bit better" * tag 'trace-v4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: trace: fix the errors caused by incompatible type of RCU variables tracing: Fix kmemleak in instance_rmdir tracing/ring_buffer: Try harder to allocate

Linus Torvalds committed 9 years ago

Commit f79ec882 parents b0a7528 f86f4186 files · +40 −26Browse files

Showing the changes to include/linux (2 of 6 files). Show all

Unified · Split

2 files

include/linux/ftrace.h +3 −3
include/linux/trace_events.h +1 −1

include/linux/ftrace.h+3−3

@@ -145,8 +145,8 @@ enum { · 144 unmodified lines
145	#ifdef CONFIG_DYNAMIC_FTRACE	145	#ifdef CONFIG_DYNAMIC_FTRACE
146	/* The hash used to know what functions callbacks trace */	146	/* The hash used to know what functions callbacks trace */
147	struct ftrace_ops_hash {	147	struct ftrace_ops_hash {
148	struct ftrace_hash *notrace_hash;	148	struct ftrace_hash __rcu *notrace_hash;
149	struct ftrace_hash *filter_hash;	149	struct ftrace_hash __rcu *filter_hash;
150	struct mutex regex_lock;	150	struct mutex regex_lock;
151	};	151	};
152		152
@@ -168,7 +168,7 @@ static inline void ftrace_free_init_mem(void) { } · 15 unmodified lines
168	*/	168	*/
169	struct ftrace_ops {	169	struct ftrace_ops {
170	ftrace_func_t func;	170	ftrace_func_t func;
171	struct ftrace_ops *next;	171	struct ftrace_ops __rcu *next;
172	unsigned long flags;	172	unsigned long flags;
173	void *private;	173	void *private;
174	ftrace_func_t saved_func;	174	ftrace_func_t saved_func;

include/linux/trace_events.h+1−1

@@ -338,7 +338,7 @@ enum { · 337 unmodified lines
338	struct trace_event_file {	338	struct trace_event_file {
339	struct list_head list;	339	struct list_head list;
340	struct trace_event_call *event_call;	340	struct trace_event_call *event_call;
341	struct event_filter *filter;	341	struct event_filter __rcu *filter;
342	struct dentry *dir;	342	struct dentry *dir;
343	struct trace_array *tr;	343	struct trace_array *tr;
344	struct trace_subsystem_dir *system;	344	struct trace_subsystem_dir *system;