mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-07-28 04:58:32 +00:00
kernel: Remove 4.19 patches
Must have missed those when removing 4.19 support in
f9f85bd4b3 ("kernel: Remove older LTS kernels")
Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
This commit is contained in:
Rolf Neugebauer
parent
6312d58032
commit
1337e07d3e
@ -1,53 +0,0 @@
|
|||||||
From 1732ff11640d5fefb35083ad0d6bc016f2fd407c Mon Sep 17 00:00:00 2001
|
|
||||||
From: Arnaldo Carvalho de Melo <acme@redhat.com>
|
|
||||||
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 <adrian.hunter@intel.com>
|
|
||||||
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
|
|
||||||
Cc: Jiri Olsa <jolsa@kernel.org>
|
|
||||||
Cc: Masami Hiramatsu <mhiramat@kernel.org>
|
|
||||||
Cc: Michael Petlan <mpetlan@redhat.com>
|
|
||||||
Cc: Namhyung Kim <namhyung@kernel.org>
|
|
||||||
Cc: Nick Clifton <nickc@redhat.com>
|
|
||||||
Cc: Peter Zijlstra <peterz@infradead.org>
|
|
||||||
Link: https://lkml.kernel.org/n/tip-03cg3gya2ju4ba2x6ibb9fuz@git.kernel.org
|
|
||||||
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
|
|
||||||
(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
|
|
||||||
|
|
||||||
@ -1,55 +0,0 @@
|
|||||||
From d5f2496c154d54f8760aa273384f49c4adfd8704 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Matt Redfearn <matt.redfearn@mips.com>
|
|
||||||
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 <matt.redfearn@mips.com>
|
|
||||||
---
|
|
||||||
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 <linux/types.h>
|
|
||||||
-#include <linux/compiler.h>
|
|
||||||
+#include <linux/stddef.h>
|
|
||||||
#include <asm/bitsperlong.h>
|
|
||||||
#include <asm/swab.h>
|
|
||||||
|
|
||||||
--
|
|
||||||
2.26.2
|
|
||||||
|
|
||||||
Loading…
Reference in New Issue
Block a user