From 574430d8ef08031ead12af30f2756a23261737d4 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 24 Oct 2023 13:32:22 +0000 Subject: [PATCH] Revert "ring-buffer: Update "shortest_full" in polling" This reverts commit cf221a7880eaabbc8852d94f283ecbded9725fb0 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 Change-Id: I786e1b755a02c6c3b82fa43ec39144a3e270981e Signed-off-by: Greg Kroah-Hartman --- kernel/trace/ring_buffer.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 34d0ee8e0e85..078cee0d6b4d 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -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;