mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-07-19 09:16:29 +00:00
kernel: Add support for 5.12.x kernel
Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
This commit is contained in:
parent
a54b9509ae
commit
01b46ba789
@ -156,7 +156,7 @@ show-tags: show-tag_$(2)$(3)$(4)
|
|||||||
|
|
||||||
# Only build perf only on x86 and recent LTS and latest stable kernels
|
# Only build perf only on x86 and recent LTS and latest stable kernels
|
||||||
ifeq ($(ARCH),x86_64)
|
ifeq ($(ARCH),x86_64)
|
||||||
ifeq ($(2), $(filter $(2),5.10.x 5.4.x))
|
ifeq ($(2), $(filter $(2),5.12.x 5.10.x 5.4.x))
|
||||||
build_perf_$(2)$(3)$(4): build_$(2)$(3)$(4)
|
build_perf_$(2)$(3)$(4): build_$(2)$(3)$(4)
|
||||||
docker pull $(ORG)/$(IMAGE_PERF):$(1)$(3)$(4)-$(TAG)$(SUFFIX) || \
|
docker pull $(ORG)/$(IMAGE_PERF):$(1)$(3)$(4)-$(TAG)$(SUFFIX) || \
|
||||||
docker build -f Dockerfile.perf \
|
docker build -f Dockerfile.perf \
|
||||||
@ -194,7 +194,7 @@ endif
|
|||||||
|
|
||||||
# Only build bcc only on x86 and recent LTS and latest stable kernels
|
# Only build bcc only on x86 and recent LTS and latest stable kernels
|
||||||
ifeq ($(ARCH),x86_64)
|
ifeq ($(ARCH),x86_64)
|
||||||
ifeq ($(2), $(filter $(2),5.10.x 5.4.x))
|
ifeq ($(2), $(filter $(2),5.12.x 5.10.x 5.4.x))
|
||||||
build_bcc_$(2)$(3)$(4): build_$(2)$(3)$(4)
|
build_bcc_$(2)$(3)$(4): build_$(2)$(3)$(4)
|
||||||
docker pull $(ORG)/$(IMAGE_BCC):$(1)$(3)$(4)-$(TAG)$(SUFFIX) || \
|
docker pull $(ORG)/$(IMAGE_BCC):$(1)$(3)$(4)-$(TAG)$(SUFFIX) || \
|
||||||
docker build -f Dockerfile.bcc \
|
docker build -f Dockerfile.bcc \
|
||||||
@ -256,12 +256,14 @@ endef
|
|||||||
# Debug targets only for latest stable and LTS stable
|
# Debug targets only for latest stable and LTS stable
|
||||||
#
|
#
|
||||||
ifeq ($(ARCH),x86_64)
|
ifeq ($(ARCH),x86_64)
|
||||||
|
$(eval $(call kernel,5.12.14,5.12.x,$(EXTRA),$(DEBUG)))
|
||||||
$(eval $(call kernel,5.10.47,5.10.x,$(EXTRA),$(DEBUG)))
|
$(eval $(call kernel,5.10.47,5.10.x,$(EXTRA),$(DEBUG)))
|
||||||
$(eval $(call kernel,5.10.47,5.10.x,,-dbg))
|
$(eval $(call kernel,5.10.47,5.10.x,,-dbg))
|
||||||
$(eval $(call kernel,5.4.129,5.4.x,$(EXTRA),$(DEBUG)))
|
$(eval $(call kernel,5.4.129,5.4.x,$(EXTRA),$(DEBUG)))
|
||||||
$(eval $(call kernel,5.11.4,5.11.x,-rt,))
|
$(eval $(call kernel,5.11.4,5.11.x,-rt,))
|
||||||
|
|
||||||
else ifeq ($(ARCH),$(filter $(ARCH),aarch64 arm64))
|
else ifeq ($(ARCH),$(filter $(ARCH),aarch64 arm64))
|
||||||
|
$(eval $(call kernel,5.12.14,5.12.x,$(EXTRA),$(DEBUG)))
|
||||||
$(eval $(call kernel,5.10.47,5.10.x,$(EXTRA),$(DEBUG)))
|
$(eval $(call kernel,5.10.47,5.10.x,$(EXTRA),$(DEBUG)))
|
||||||
$(eval $(call kernel,5.11.4,5.11.x,-rt,))
|
$(eval $(call kernel,5.11.4,5.11.x,-rt,))
|
||||||
|
|
||||||
|
5216
kernel/config-5.12.x-aarch64
Normal file
5216
kernel/config-5.12.x-aarch64
Normal file
File diff suppressed because it is too large
Load Diff
4835
kernel/config-5.12.x-x86_64
Normal file
4835
kernel/config-5.12.x-x86_64
Normal file
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,55 @@
|
|||||||
|
From 3635a8090f2271103511b68a5853b1d7e0a925b5 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] 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