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

Commit 5ca567ae authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge cf221a78 ("ring-buffer: Update "shortest_full" in polling") into android11-5.4-lts 



Steps on the way to 5.4.258

Change-Id: I023aadde4d7ab16ac9c5393996cc24ed20874e2d
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents fc8b7e30 cf221a78

kernel/trace/ring_buffer.c

+3 −0
Original line number Diff line number Diff line
@@ -741,6 +741,9 @@ __poll_t ring_buffer_poll_wait(struct ring_buffer *buffer, int cpu, 
	if (full) {

		poll_wait(filp, &work->full_waiters, poll_table);

		work->full_waiters_pending = true;

		if (!cpu_buffer->shortest_full ||

		    cpu_buffer->shortest_full > full)

			cpu_buffer->shortest_full = full;

	} else {

		poll_wait(filp, &work->waiters, poll_table);

		work->waiters_pending = true;