[PATCH] Deal with vc_data ABI changes in 5.10.40

struct vc_data changed with a14ca25d4f23 ("vt: Fix character height
handling with VT_RESIZEX"); although it shouldn't be used by OOT modules
it does affect symbol versions for many of the console handling
functions.

Signed-off-by: Salvatore Bonaccorso <carnil@debian.org>
Gbp-Pq: Topic debian
Gbp-Pq: Name Deal-with-vc_data-ABI-changes-in-5.10.40.patch

diff --git a/include/linux/console_struct.h b/include/linux/console_struct.h
index d5b9c8d40c18e8d4bbe3d21fe3a1031a40a47acd..b6f31155245494bb333c8fd9ca97230ce545e175 100644 (file)
--- a/include/linux/console_struct.h
+++ b/include/linux/console_struct.h
@@ -101,7 +101,6 @@ struct vc_data {
        unsigned int    vc_rows;
        unsigned int    vc_size_row;            /* Bytes per row */
        unsigned int    vc_scan_lines;          /* # of scan lines */
-       unsigned int    vc_cell_height;         /* CRTC character cell height */
        unsigned long   vc_origin;              /* [!] Start of real screen */
        unsigned long   vc_scr_end;             /* [!] End of real screen */
        unsigned long   vc_visible_origin;      /* [!] Top of visible window */
@@ -161,6 +160,10 @@ struct vc_data {
        struct uni_pagedir **vc_uni_pagedir_loc; /* [!] Location of uni_pagedir variable for this console */
        struct uni_screen *vc_uni_screen;       /* unicode screen content */
        /* additional information is in vt_kern.h */
+
+#ifndef __GENKSYMS__
+       unsigned int    vc_cell_height;         /* CRTC character cell height */
+#endif
 };
 
 struct vc {