diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-20 16:11:21 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-20 16:11:21 -0500 |
commit | 95763dd52b4b9b3578d3428001ece1e11b016ffc (patch) | |
tree | fae1b9baa31810dcf45aa2fe2ab38a8fdbbd1a43 /kernel/trace/ring_buffer.c | |
parent | 0260da162fa12c899b4377e71c243a631438c148 (diff) | |
parent | 6d5b43a67accf6793ed259f6534b4bd53b1e5696 (diff) |
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/ring_buffer.c')
-rw-r--r-- | kernel/trace/ring_buffer.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 036456cbb4f7..f780e9552f91 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c | |||
@@ -617,6 +617,7 @@ int ring_buffer_resize(struct ring_buffer *buffer, unsigned long size) | |||
617 | list_del_init(&page->list); | 617 | list_del_init(&page->list); |
618 | free_buffer_page(page); | 618 | free_buffer_page(page); |
619 | } | 619 | } |
620 | mutex_unlock(&buffer->mutex); | ||
620 | return -ENOMEM; | 621 | return -ENOMEM; |
621 | } | 622 | } |
622 | 623 | ||