From 4c272e6c3d2b4fbe5f96b35f99fdbe34f9ee2e84 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mar 10 2023 12:53:45 +0000 Subject: kABI workaround for struct fb_deferred_io changes (bsc#1208266). --- diff --git a/patches.kabi/fb_deferred_io-kABI-workaround.patch b/patches.kabi/fb_deferred_io-kABI-workaround.patch new file mode 100644 index 0000000..99fda19 --- /dev/null +++ b/patches.kabi/fb_deferred_io-kABI-workaround.patch @@ -0,0 +1,28 @@ +From: Takashi Iwai +Subject: kABI workaround for struct fb_deferred_io changes +Patch-mainline: Never, kABI workaround +References: bsc#1208266 + +A new field was added to struct fb_deferred_io that broke kABI. +For keeping kABI compatibility, change it for short to fit into the +existing hole (3 bytes for armv7hl), and wrap with __GENKSYMS__. + +Signed-off-by: Takashi Iwai + +--- + include/linux/fb.h | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +--- a/include/linux/fb.h ++++ b/include/linux/fb.h +@@ -212,7 +212,9 @@ struct fb_deferred_io { + /* delay between mkwrite and deferred handler */ + unsigned long delay; + bool sort_pagereflist; /* sort pagelist by offset */ +- int open_count; /* number of opened files; protected by fb_info lock */ ++#ifndef __GENKSYMS__ ++ short open_count; /* number of opened files; protected by fb_info lock */ ++#endif + struct mutex lock; /* mutex that protects the pageref list */ + struct list_head pagereflist; /* list of pagerefs for touched pages */ + /* callback */ diff --git a/series.conf b/series.conf index ac7c2d9..62e734a 100644 --- a/series.conf +++ b/series.conf @@ -37384,6 +37384,7 @@ # kABI consistency patches ######################################################## patches.rpmify/BTF-Don-t-break-ABI-when-debuginfo-is-disabled.patch + patches.kabi/fb_deferred_io-kABI-workaround.patch ######################################################## # SLE15-SP3 OOT performance patches evaluated but left