Commit 574430d8 authored Oct 24, 2023 by Greg Kroah-Hartman

Revert "ring-buffer: Update "shortest_full" in polling"



This reverts commit cf221a78 which is
commit 1e0cb399c7653462d9dadf8ab9425337c355d358 upstream.

It is needed to be dropped due to another conflict that is causing
crashes during Android testing.

Bug: 263508491
Cc: Lee Jones <joneslee@google.com>
Change-Id: I786e1b755a02c6c3b82fa43ec39144a3e270981e
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

parent 5ca567ae

kernel/trace/ring_buffer.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -741,9 +741,6 @@ __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;