diff options
Diffstat (limited to 'kernel/trace/ring_buffer.c')
-rw-r--r-- | kernel/trace/ring_buffer.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 9a91479bbbfe..41b6f96e5366 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c | |||
@@ -4191,6 +4191,7 @@ EXPORT_SYMBOL_GPL(ring_buffer_consume); | |||
4191 | * ring_buffer_read_prepare - Prepare for a non consuming read of the buffer | 4191 | * ring_buffer_read_prepare - Prepare for a non consuming read of the buffer |
4192 | * @buffer: The ring buffer to read from | 4192 | * @buffer: The ring buffer to read from |
4193 | * @cpu: The cpu buffer to iterate over | 4193 | * @cpu: The cpu buffer to iterate over |
4194 | * @flags: gfp flags to use for memory allocation | ||
4194 | * | 4195 | * |
4195 | * This performs the initial preparations necessary to iterate | 4196 | * This performs the initial preparations necessary to iterate |
4196 | * through the buffer. Memory is allocated, buffer recording | 4197 | * through the buffer. Memory is allocated, buffer recording |
@@ -4208,7 +4209,7 @@ EXPORT_SYMBOL_GPL(ring_buffer_consume); | |||
4208 | * This overall must be paired with ring_buffer_read_finish. | 4209 | * This overall must be paired with ring_buffer_read_finish. |
4209 | */ | 4210 | */ |
4210 | struct ring_buffer_iter * | 4211 | struct ring_buffer_iter * |
4211 | ring_buffer_read_prepare(struct ring_buffer *buffer, int cpu) | 4212 | ring_buffer_read_prepare(struct ring_buffer *buffer, int cpu, gfp_t flags) |
4212 | { | 4213 | { |
4213 | struct ring_buffer_per_cpu *cpu_buffer; | 4214 | struct ring_buffer_per_cpu *cpu_buffer; |
4214 | struct ring_buffer_iter *iter; | 4215 | struct ring_buffer_iter *iter; |
@@ -4216,7 +4217,7 @@ ring_buffer_read_prepare(struct ring_buffer *buffer, int cpu) | |||
4216 | if (!cpumask_test_cpu(cpu, buffer->cpumask)) | 4217 | if (!cpumask_test_cpu(cpu, buffer->cpumask)) |
4217 | return NULL; | 4218 | return NULL; |
4218 | 4219 | ||
4219 | iter = kmalloc(sizeof(*iter), GFP_KERNEL); | 4220 | iter = kmalloc(sizeof(*iter), flags); |
4220 | if (!iter) | 4221 | if (!iter) |
4221 | return NULL; | 4222 | return NULL; |
4222 | 4223 | ||