diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-17 00:53:53 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-17 00:53:53 +0300 |
| commit | c15cb37cc4e9809624411333b96109ddf770e29c (patch) | |
| tree | 3d4dbb48d97d5df9096ad815b99b20660cdc1bbf /kernel/trace/ring_buffer.c | |
| parent | 77be80e437fec44f8b7a620314b7d7b605b8d93b (diff) | |
| parent | 8b1fae4e4200388b64dd88065639413cb3f1051c (diff) | |
| download | linux-c15cb37cc4e9809624411333b96109ddf770e29c.tar.xz | |
Merge commit 'v2.6.28-rc8' into x86/uv
Diffstat (limited to 'kernel/trace/ring_buffer.c')
| -rw-r--r-- | kernel/trace/ring_buffer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 036456cbb4f7..668bbb5ef2bd 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) list_del_init(&page->list); free_buffer_page(page); } + mutex_unlock(&buffer->mutex); return -ENOMEM; } @@ -1214,7 +1215,7 @@ ring_buffer_lock_reserve(struct ring_buffer *buffer, out: if (resched) - preempt_enable_notrace(); + preempt_enable_no_resched_notrace(); else preempt_enable_notrace(); return NULL; |