Merge bdb575f872 ("Merge tag 'drm-fixes-2021-09-17' of git://anongit.freedesktop.org/drm/drm") into android-mainline

Steps on the way to 5.15-rc2

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Id7ae8fe00ef75a10c28b62553ee8cf42a6db5729
This commit is contained in:
Greg Kroah-Hartman
2021-09-17 16:20:00 +02:00
183 changed files with 1923 additions and 1080 deletions

View File

@@ -1168,9 +1168,9 @@ void __init setup_log_buf(int early)
return;
err_free_descs:
memblock_free(__pa(new_descs), new_descs_size);
memblock_free_ptr(new_descs, new_descs_size);
err_free_log_buf:
memblock_free(__pa(new_log_buf), new_log_buf_len);
memblock_free_ptr(new_log_buf, new_log_buf_len);
}
static bool __read_mostly ignore_loglevel;