Commit 6e0f17be authored by Ingo Molnar's avatar Ingo Molnar

Merge branch 'tip/perf/core' of...

Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core

Pull tracing fix from Steve Rostedt.
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents a2fe1947 93574fcc
...@@ -2390,6 +2390,9 @@ __tracing_open(struct inode *inode, struct file *file) ...@@ -2390,6 +2390,9 @@ __tracing_open(struct inode *inode, struct file *file)
iter->buffer_iter = kzalloc(sizeof(*iter->buffer_iter) * num_possible_cpus(), iter->buffer_iter = kzalloc(sizeof(*iter->buffer_iter) * num_possible_cpus(),
GFP_KERNEL); GFP_KERNEL);
if (!iter->buffer_iter)
goto release;
/* /*
* We make a copy of the current tracer to avoid concurrent * We make a copy of the current tracer to avoid concurrent
* changes on it while we are reading. * changes on it while we are reading.
...@@ -2451,6 +2454,7 @@ __tracing_open(struct inode *inode, struct file *file) ...@@ -2451,6 +2454,7 @@ __tracing_open(struct inode *inode, struct file *file)
mutex_unlock(&trace_types_lock); mutex_unlock(&trace_types_lock);
kfree(iter->trace); kfree(iter->trace);
kfree(iter->buffer_iter); kfree(iter->buffer_iter);
release:
seq_release_private(inode, file); seq_release_private(inode, file);
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment