lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Pull tracing fix from Steve Rostedt.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar
2012-07-18 11:18:00 +02:00
parent a2fe194723 93574fcc5b
commit 6e0f17be03
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/trace/trace.c
View 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)
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);
} }