From db1cb359996bee226f5526fbf71c9a30cf62cfc9 Mon Sep 17 00:00:00 2001 From: Ilya Dmitrichenko Date: Wed, 10 May 2023 19:26:45 +0100 Subject: [PATCH] Remove patch that is now in 5.4 and 5.10 trees - https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/include/uapi/linux/swab.h?h=v5.15.110&id=c160505c9b574b346031fdf2c649d19e7939ca11 - https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/include/uapi/linux/swab.h?h=v5.4.242&id=6a54d033372d2272e0e5b710df752dc5ad29e850 Signed-off-by: Ilya Dmitrichenko --- ...ux-swab-Fix-potentially-missing-__al.patch | 55 ------------------- ...ux-swab-Fix-potentially-missing-__al.patch | 55 ------------------- 2 files changed, 110 deletions(-) delete mode 100644 kernel/patches-5.10.x/0001-include-uapi-linux-swab-Fix-potentially-missing-__al.patch delete mode 100644 kernel/patches-5.4.x/0001-include-uapi-linux-swab-Fix-potentially-missing-__al.patch diff --git a/kernel/patches-5.10.x/0001-include-uapi-linux-swab-Fix-potentially-missing-__al.patch b/kernel/patches-5.10.x/0001-include-uapi-linux-swab-Fix-potentially-missing-__al.patch deleted file mode 100644 index 9307744a8a..0000000000 --- a/kernel/patches-5.10.x/0001-include-uapi-linux-swab-Fix-potentially-missing-__al.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 3635a8090f2271103511b68a5853b1d7e0a925b5 Mon Sep 17 00:00:00 2001 -From: Matt Redfearn -Date: Wed, 3 Jan 2018 09:57:30 +0000 -Subject: [PATCH] include/uapi/linux/swab: Fix potentially missing - __always_inline -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Commit bc27fb68aaad ("include/uapi/linux/byteorder, swab: force inlining -of some byteswap operations") added __always_inline to swab functions -and commit 283d75737837 ("uapi/linux/stddef.h: Provide __always_inline to -userspace headers") added a definition of __always_inline for use in -exported headers when the kernel's compiler.h is not available. - -However, since swab.h does not include stddef.h, if the header soup does -not indirectly include it, the definition of __always_inline is missing, -resulting in a compilation failure, which was observed compiling the -perf tool using exported headers containing this commit: - -In file included from /usr/include/linux/byteorder/little_endian.h:12:0, - from /usr/include/asm/byteorder.h:14, - from tools/include/uapi/linux/perf_event.h:20, - from perf.h:8, - from builtin-bench.c:18: -/usr/include/linux/swab.h:160:8: error: unknown type name ‘__always_inline’ - static __always_inline __u16 __swab16p(const __u16 *p) - -Fix this by replacing the inclusion of linux/compiler.h with -linux/stddef.h to ensure that we pick up that definition if required, -without relying on it's indirect inclusion. compiler.h is then included -indirectly, via stddef.h. - -Fixes: 283d75737837 ("uapi/linux/stddef.h: Provide __always_inline to userspace headers") -Signed-off-by: Matt Redfearn ---- - include/uapi/linux/swab.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h -index 7272f85d6d6a..3736f2fe1541 100644 ---- a/include/uapi/linux/swab.h -+++ b/include/uapi/linux/swab.h -@@ -3,7 +3,7 @@ - #define _UAPI_LINUX_SWAB_H - - #include --#include -+#include - #include - #include - --- -2.26.2 - diff --git a/kernel/patches-5.4.x/0001-include-uapi-linux-swab-Fix-potentially-missing-__al.patch b/kernel/patches-5.4.x/0001-include-uapi-linux-swab-Fix-potentially-missing-__al.patch deleted file mode 100644 index 9307744a8a..0000000000 --- a/kernel/patches-5.4.x/0001-include-uapi-linux-swab-Fix-potentially-missing-__al.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 3635a8090f2271103511b68a5853b1d7e0a925b5 Mon Sep 17 00:00:00 2001 -From: Matt Redfearn -Date: Wed, 3 Jan 2018 09:57:30 +0000 -Subject: [PATCH] include/uapi/linux/swab: Fix potentially missing - __always_inline -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Commit bc27fb68aaad ("include/uapi/linux/byteorder, swab: force inlining -of some byteswap operations") added __always_inline to swab functions -and commit 283d75737837 ("uapi/linux/stddef.h: Provide __always_inline to -userspace headers") added a definition of __always_inline for use in -exported headers when the kernel's compiler.h is not available. - -However, since swab.h does not include stddef.h, if the header soup does -not indirectly include it, the definition of __always_inline is missing, -resulting in a compilation failure, which was observed compiling the -perf tool using exported headers containing this commit: - -In file included from /usr/include/linux/byteorder/little_endian.h:12:0, - from /usr/include/asm/byteorder.h:14, - from tools/include/uapi/linux/perf_event.h:20, - from perf.h:8, - from builtin-bench.c:18: -/usr/include/linux/swab.h:160:8: error: unknown type name ‘__always_inline’ - static __always_inline __u16 __swab16p(const __u16 *p) - -Fix this by replacing the inclusion of linux/compiler.h with -linux/stddef.h to ensure that we pick up that definition if required, -without relying on it's indirect inclusion. compiler.h is then included -indirectly, via stddef.h. - -Fixes: 283d75737837 ("uapi/linux/stddef.h: Provide __always_inline to userspace headers") -Signed-off-by: Matt Redfearn ---- - include/uapi/linux/swab.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h -index 7272f85d6d6a..3736f2fe1541 100644 ---- a/include/uapi/linux/swab.h -+++ b/include/uapi/linux/swab.h -@@ -3,7 +3,7 @@ - #define _UAPI_LINUX_SWAB_H - - #include --#include -+#include - #include - #include - --- -2.26.2 -