History

ring_buffer: ring_buffer_empty{cpu}() can return boolean

Make ring_buffer_empty() and ring_buffer_empty_cpu() return bool. No functional change. Link: http://lkml.kernel.org/r/1443537816-5788-5-git-send-email-bywxiaobai@163.com

Yaowei Bai committed 11 years ago

Commit 3d4e2041 parent 06ca3202 files · +7 −7Browse files

Unified · Split

2 files
  1. include/linux/ring_buffer.h +2 −2
  2. kernel/trace/ring_buffer.c +5 −5
include/linux/ring_buffer.h+2−2
@@ -154,8 +154,8 @@ ring_buffer_swap_cpu(struct ring_buffer *buffer_a, · 153 unmodified lines
154}154}
155#endif155#endif
156 156
157int ring_buffer_empty(struct ring_buffer *buffer);157bool ring_buffer_empty(struct ring_buffer *buffer);
158int ring_buffer_empty_cpu(struct ring_buffer *buffer, int cpu);158bool ring_buffer_empty_cpu(struct ring_buffer *buffer, int cpu);
159 159
160void ring_buffer_record_disable(struct ring_buffer *buffer);160void ring_buffer_record_disable(struct ring_buffer *buffer);
161void ring_buffer_record_enable(struct ring_buffer *buffer);161void ring_buffer_record_enable(struct ring_buffer *buffer);
kernel/trace/ring_buffer.c+5−5
@@ -4267,7 +4267,7 @@ EXPORT_SYMBOL_GPL(ring_buffer_reset); · 4266 unmodified lines
4267 * rind_buffer_empty - is the ring buffer empty?4267 * rind_buffer_empty - is the ring buffer empty?
4268 * @buffer: The ring buffer to test4268 * @buffer: The ring buffer to test
4269 */4269 */
4270int ring_buffer_empty(struct ring_buffer *buffer)4270bool ring_buffer_empty(struct ring_buffer *buffer)
4271{4271{
4272 struct ring_buffer_per_cpu *cpu_buffer;4272 struct ring_buffer_per_cpu *cpu_buffer;
4273 unsigned long flags;4273 unsigned long flags;
@@ -4285,10 +4285,10 @@ int ring_buffer_empty(struct ring_buffer *buffer) · 11 unmodified lines
4285 local_irq_restore(flags);4285 local_irq_restore(flags);
4286 4286
4287 if (!ret)4287 if (!ret)
4288 return 0;4288 return false;
4289 }4289 }
4290 4290
4291 return 1;4291 return true;
4292}4292}
4293EXPORT_SYMBOL_GPL(ring_buffer_empty);4293EXPORT_SYMBOL_GPL(ring_buffer_empty);
4294 4294
@@ -4297,7 +4297,7 @@ EXPORT_SYMBOL_GPL(ring_buffer_empty); · 2 unmodified lines
4297 * @buffer: The ring buffer4297 * @buffer: The ring buffer
4298 * @cpu: The CPU buffer to test4298 * @cpu: The CPU buffer to test
4299 */4299 */
4300int ring_buffer_empty_cpu(struct ring_buffer *buffer, int cpu)4300bool ring_buffer_empty_cpu(struct ring_buffer *buffer, int cpu)
4301{4301{
4302 struct ring_buffer_per_cpu *cpu_buffer;4302 struct ring_buffer_per_cpu *cpu_buffer;
4303 unsigned long flags;4303 unsigned long flags;
@@ -4305,7 +4305,7 @@ int ring_buffer_empty_cpu(struct ring_buffer *buffer, int cpu) · 1 unmodified line
4305 int ret;4305 int ret;
4306 4306
4307 if (!cpumask_test_cpu(cpu, buffer->cpumask))4307 if (!cpumask_test_cpu(cpu, buffer->cpumask))
4308 return 1;4308 return true;
4309 4309
4310 cpu_buffer = buffer->buffers[cpu];4310 cpu_buffer = buffer->buffers[cpu];
4311 local_irq_save(flags);4311 local_irq_save(flags);