diff --git a/kernel/patches-4.19.x/0001-perf-symbols-Add-fallback-definitions-for-GELF_ST_VI.patch b/kernel/patches-4.19.x/0001-perf-symbols-Add-fallback-definitions-for-GELF_ST_VI.patch deleted file mode 100644 index 528139aed..000000000 --- a/kernel/patches-4.19.x/0001-perf-symbols-Add-fallback-definitions-for-GELF_ST_VI.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 1732ff11640d5fefb35083ad0d6bc016f2fd407c Mon Sep 17 00:00:00 2001 -From: Arnaldo Carvalho de Melo -Date: Mon, 4 Feb 2019 15:48:03 -0300 -Subject: [PATCH 1/2] perf symbols: Add fallback definitions for - GELF_ST_VISIBILITY() - -Those aren't present in Alpine Linux 3.4 to edge, so provide fallback -defines to get the next patch building there keeping the build -bisectable. - -Cc: Adrian Hunter -Cc: Alexander Shishkin -Cc: Jiri Olsa -Cc: Masami Hiramatsu -Cc: Michael Petlan -Cc: Namhyung Kim -Cc: Nick Clifton -Cc: Peter Zijlstra -Link: https://lkml.kernel.org/n/tip-03cg3gya2ju4ba2x6ibb9fuz@git.kernel.org -Signed-off-by: Arnaldo Carvalho de Melo -(cherry picked from commit 843cf70ed29a7fb51f1e796c1d6e1ba3620250ac) ---- - tools/perf/util/symbol-elf.c | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c -index a701a8a48f00..dc3fbcbb0e79 100644 ---- a/tools/perf/util/symbol-elf.c -+++ b/tools/perf/util/symbol-elf.c -@@ -19,6 +19,20 @@ - #define EM_AARCH64 183 /* ARM 64 bit */ - #endif - -+#ifndef ELF32_ST_VISIBILITY -+#define ELF32_ST_VISIBILITY(o) ((o) & 0x03) -+#endif -+ -+/* For ELF64 the definitions are the same. */ -+#ifndef ELF64_ST_VISIBILITY -+#define ELF64_ST_VISIBILITY(o) ELF32_ST_VISIBILITY (o) -+#endif -+ -+/* How to extract information held in the st_other field. */ -+#ifndef GELF_ST_VISIBILITY -+#define GELF_ST_VISIBILITY(val) ELF64_ST_VISIBILITY (val) -+#endif -+ - typedef Elf64_Nhdr GElf_Nhdr; - - #ifdef HAVE_CPLUS_DEMANGLE_SUPPORT --- -2.26.2 - diff --git a/kernel/patches-4.19.x/0002-include-uapi-linux-swab-Fix-potentially-missing-__al.patch b/kernel/patches-4.19.x/0002-include-uapi-linux-swab-Fix-potentially-missing-__al.patch deleted file mode 100644 index a7c1529a9..000000000 --- a/kernel/patches-4.19.x/0002-include-uapi-linux-swab-Fix-potentially-missing-__al.patch +++ /dev/null @@ -1,55 +0,0 @@ -From d5f2496c154d54f8760aa273384f49c4adfd8704 Mon Sep 17 00:00:00 2001 -From: Matt Redfearn -Date: Wed, 3 Jan 2018 09:57:30 +0000 -Subject: [PATCH 2/2] 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 -