Commit ecf92700 authored by Al Viro's avatar Al Viro
Browse files

ring_buffer_poll_wait() return value used as return value of ->poll() 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent afc9a42b

include/linux/ring_buffer.h

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ __ring_buffer_alloc(unsigned long size, unsigned flags, struct lock_class_key *k 
})



int ring_buffer_wait(struct ring_buffer *buffer, int cpu, bool full);

int ring_buffer_poll_wait(struct ring_buffer *buffer, int cpu,

__poll_t ring_buffer_poll_wait(struct ring_buffer *buffer, int cpu,

			  struct file *filp, poll_table *poll_table);

kernel/trace/ring_buffer.c

+1 −1
Original line number Diff line number Diff line
@@ -626,7 +626,7 @@ int ring_buffer_wait(struct ring_buffer *buffer, int cpu, bool full) 
 * Returns POLLIN | POLLRDNORM if data exists in the buffers,

 * zero otherwise.

 */

int ring_buffer_poll_wait(struct ring_buffer *buffer, int cpu,

__poll_t ring_buffer_poll_wait(struct ring_buffer *buffer, int cpu,

			  struct file *filp, poll_table *poll_table)

{

	struct ring_buffer_per_cpu *cpu_buffer;