diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-20 22:11:21 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-20 22:11:21 +0100 |
| commit | 95763dd52b4b9b3578d3428001ece1e11b016ffc (patch) | |
| tree | fae1b9baa31810dcf45aa2fe2ab38a8fdbbd1a43 /kernel/trace/trace.c | |
| parent | Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | Merge branch 'tip/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/ro... (diff) | |
| download | linux-95763dd52b4b9b3578d3428001ece1e11b016ffc.tar.xz linux-95763dd52b4b9b3578d3428001ece1e11b016ffc.zip | |
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
ftrace: fix dyn ftrace filter selection
ftrace: make filtered functions effective on setting
ftrace: fix set_ftrace_filter
trace: introduce missing mutex_unlock()
tracing: kernel/trace/trace.c: introduce missing kfree()
Diffstat (limited to 'kernel/trace/trace.c')
| -rw-r--r-- | kernel/trace/trace.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 697eda36b86a..d86e3252f300 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -1936,6 +1936,7 @@ __tracing_open(struct inode *inode, struct file *file, int *ret) ring_buffer_read_finish(iter->buffer_iter[cpu]); } mutex_unlock(&trace_types_lock); + kfree(iter); return ERR_PTR(-ENOMEM); } |