aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace/ring_buffer.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/trace/ring_buffer.c')
-rw-r--r--kernel/trace/ring_buffer.c3
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)
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
@@ -1214,7 +1215,7 @@ ring_buffer_lock_reserve(struct ring_buffer *buffer,
1214 1215
1215 out: 1216 out:
1216 if (resched) 1217 if (resched)
1217 preempt_enable_notrace(); 1218 preempt_enable_no_resched_notrace();
1218 else 1219 else
1219 preempt_enable_notrace(); 1220 preempt_enable_notrace();
1220 return NULL; 1221 return NULL;