summaryrefslogtreecommitdiff
path: root/kernel/trace/ring_buffer.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2026-01-19 10:24:11 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2026-01-19 10:24:11 +0100
commit5ac87cd859eca21ebf657d94affd29f40003bede (patch)
tree7323330be011e06131e279c0c108b59f94d70a2d /kernel/trace/ring_buffer.c
parentfa3bb5011f33cccd246072954e64d64483d0d774 (diff)
parent24d479d26b25bce5faea3ddd9fa8f3a6c3129ea7 (diff)
Merge 6.19-rc6 usb-next
We need the USB fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/trace/ring_buffer.c')
-rw-r--r--kernel/trace/ring_buffer.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index 41c9f5d079be..630221b00838 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -3137,6 +3137,8 @@ int ring_buffer_resize(struct trace_buffer *buffer, unsigned long size,
list) {
list_del_init(&bpage->list);
free_buffer_page(bpage);
+
+ cond_resched();
}
}
out_err_unlock: