Merge 05264d6551
("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: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
commit
09125ac12e
@ -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();
|
||||
|
Loading…
Reference in New Issue
Block a user