Merge tag 'v7.0-rc7' into android-mainline

Linux 7.0-rc7

Change-Id: If5c2c178d71676ea4c3cf8898db5d92916c44ed1
Signed-off-by: Carlos Llamas <cmllamas@google.com>
This commit is contained in:
Carlos Llamas committed 2026-04-23 02:21:55 +00:00
commit 98cd2c9853
119 files changed
+1435 -657

No files matched your search

+18
View File
@@ -1909,6 +1909,24 @@ static void leave_alt_screen(struct vc_data *vc)
dest = ((u16 *)vc->vc_origin) + r * vc->vc_cols;
memcpy(dest, src, 2 * cols);
}
/*
* If the console was resized while in the alternate screen,
* resize the saved unicode buffer to the current dimensions.
* On allocation failure new_uniscr is NULL, causing the old
* buffer to be freed and vc_uni_lines to be lazily rebuilt
* via vc_uniscr_check() when next needed.
*/
if (vc->vc_saved_uni_lines &&
(vc->vc_saved_rows != vc->vc_rows ||
vc->vc_saved_cols != vc->vc_cols)) {
u32 **new_uniscr = vc_uniscr_alloc(vc->vc_cols, vc->vc_rows);
if (new_uniscr)
vc_uniscr_copy_area(new_uniscr, vc->vc_cols, vc->vc_rows,
vc->vc_saved_uni_lines, cols, 0, rows);
vc_uniscr_free(vc->vc_saved_uni_lines);
vc->vc_saved_uni_lines = new_uniscr;
}
vc_uniscr_set(vc, vc->vc_saved_uni_lines);
vc->vc_saved_uni_lines = NULL;
restore_cur(vc);