diff options
author | Yaowei Bai <bywxiaobai@163.com> | 2015-09-29 10:43:32 -0400 |
---|---|---|
committer | Steven Rostedt <rostedt@goodmis.org> | 2015-11-02 14:23:38 -0500 |
commit | 3d4e204d81eec30abffe55d01912e07ce81eef12 (patch) | |
tree | 13418a32742d938683cbbdfa2cf5b712a773d8eb | |
parent | 06ca320952dc21c537055d2aa36a2c2e96a1b94d (diff) |
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
Signed-off-by: Yaowei Bai <bywxiaobai@163.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
-rw-r--r-- | include/linux/ring_buffer.h | 4 | ||||
-rw-r--r-- | kernel/trace/ring_buffer.c | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/include/linux/ring_buffer.h b/include/linux/ring_buffer.h index e2c13cd863bd..4acc552e9279 100644 --- a/include/linux/ring_buffer.h +++ b/include/linux/ring_buffer.h | |||
@@ -154,8 +154,8 @@ ring_buffer_swap_cpu(struct ring_buffer *buffer_a, | |||
154 | } | 154 | } |
155 | #endif | 155 | #endif |
156 | 156 | ||
157 | int ring_buffer_empty(struct ring_buffer *buffer); | 157 | bool ring_buffer_empty(struct ring_buffer *buffer); |
158 | int ring_buffer_empty_cpu(struct ring_buffer *buffer, int cpu); | 158 | bool ring_buffer_empty_cpu(struct ring_buffer *buffer, int cpu); |
159 | 159 | ||
160 | void ring_buffer_record_disable(struct ring_buffer *buffer); | 160 | void ring_buffer_record_disable(struct ring_buffer *buffer); |
161 | void ring_buffer_record_enable(struct ring_buffer *buffer); | 161 | void ring_buffer_record_enable(struct ring_buffer *buffer); |
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 26a948f3187f..fc9ce12666be 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c | |||
@@ -4267,7 +4267,7 @@ EXPORT_SYMBOL_GPL(ring_buffer_reset); | |||
4267 | * rind_buffer_empty - is the ring buffer empty? | 4267 | * rind_buffer_empty - is the ring buffer empty? |
4268 | * @buffer: The ring buffer to test | 4268 | * @buffer: The ring buffer to test |
4269 | */ | 4269 | */ |
4270 | int ring_buffer_empty(struct ring_buffer *buffer) | 4270 | bool 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) | |||
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 | } |
4293 | EXPORT_SYMBOL_GPL(ring_buffer_empty); | 4293 | EXPORT_SYMBOL_GPL(ring_buffer_empty); |
4294 | 4294 | ||
@@ -4297,7 +4297,7 @@ EXPORT_SYMBOL_GPL(ring_buffer_empty); | |||
4297 | * @buffer: The ring buffer | 4297 | * @buffer: The ring buffer |
4298 | * @cpu: The CPU buffer to test | 4298 | * @cpu: The CPU buffer to test |
4299 | */ | 4299 | */ |
4300 | int ring_buffer_empty_cpu(struct ring_buffer *buffer, int cpu) | 4300 | bool 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) | |||
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); |