Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d4e204d authored by Yaowei Bai's avatar Yaowei Bai Committed by Steven Rostedt
Browse files

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: default avatarYaowei Bai <bywxiaobai@163.com>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 06ca3209

include/linux/ring_buffer.h

+2 −2
Original line number Diff line number Diff line
@@ -154,8 +154,8 @@ ring_buffer_swap_cpu(struct ring_buffer *buffer_a, 
}

#endif



int ring_buffer_empty(struct ring_buffer *buffer);

int ring_buffer_empty_cpu(struct ring_buffer *buffer, int cpu);

bool ring_buffer_empty(struct ring_buffer *buffer);

bool ring_buffer_empty_cpu(struct ring_buffer *buffer, int cpu);



void ring_buffer_record_disable(struct ring_buffer *buffer);

void ring_buffer_record_enable(struct ring_buffer *buffer);

kernel/trace/ring_buffer.c

+5 −5
Original line number Diff line number Diff line
@@ -4267,7 +4267,7 @@ EXPORT_SYMBOL_GPL(ring_buffer_reset); 
 * rind_buffer_empty - is the ring buffer empty?

 * @buffer: The ring buffer to test

 */

int ring_buffer_empty(struct ring_buffer *buffer)

bool ring_buffer_empty(struct ring_buffer *buffer)

{

	struct ring_buffer_per_cpu *cpu_buffer;

	unsigned long flags;
@@ -4285,10 +4285,10 @@ int ring_buffer_empty(struct ring_buffer *buffer) 
		local_irq_restore(flags);



		if (!ret)

			return 0;

			return false;

	}



	return 1;

	return true;

}

EXPORT_SYMBOL_GPL(ring_buffer_empty);
@@ -4297,7 +4297,7 @@ EXPORT_SYMBOL_GPL(ring_buffer_empty); 
 * @buffer: The ring buffer

 * @cpu: The CPU buffer to test

 */

int ring_buffer_empty_cpu(struct ring_buffer *buffer, int cpu)

bool ring_buffer_empty_cpu(struct ring_buffer *buffer, int cpu)

{

	struct ring_buffer_per_cpu *cpu_buffer;

	unsigned long flags;
@@ -4305,7 +4305,7 @@ int ring_buffer_empty_cpu(struct ring_buffer *buffer, int cpu) 
	int ret;



	if (!cpumask_test_cpu(cpu, buffer->cpumask))

		return 1;

		return true;



	cpu_buffer = buffer->buffers[cpu];

	local_irq_save(flags);