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

Commit 09125ac1 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 05264d65 ("ring-buffer: Avoid softlockup in ring_buffer_resize()") into android11-5.4-lts



Steps on the way to 5.4.258

Change-Id: I7a2c545794738eee776c7e629e6baf2d0c38f119
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 82d0266c 05264d65
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -1797,6 +1797,8 @@ int ring_buffer_resize(struct ring_buffer *buffer, unsigned long size,
				err = -ENOMEM;
				goto out_err;
			}

			cond_resched();
		}

		get_online_cpus();