aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAriadne Conill <ariadne@dereferenced.org>2021-05-29 08:53:44 -0600
committerAriadne Conill <ariadne@dereferenced.org>2021-05-29 08:54:40 -0600
commitbfb7230ff5369e6352f72baa5f34427942042590 (patch)
treec6e517a89a5d5f4f6e2ff771cf6e21134a1f8fea
parent28ece6a5025e0b3fc78675c1c84baee3167de0ca (diff)
downloadaports-bfb7230ff5369e6352f72baa5f34427942042590.tar.gz
aports-bfb7230ff5369e6352f72baa5f34427942042590.tar.bz2
aports-bfb7230ff5369e6352f72baa5f34427942042590.tar.xz
main/linux-headers: upgrade to 5.10.41, backport BTF_KIND_FLOAT UAPI definition
-rw-r--r--main/linux-headers/APKBUILD12
-rw-r--r--main/linux-headers/add-btf-float-uapi.patch38
2 files changed, 46 insertions, 4 deletions
diff --git a/main/linux-headers/APKBUILD b/main/linux-headers/APKBUILD
index b723ab151a..f0e8c63181 100644
--- a/main/linux-headers/APKBUILD
+++ b/main/linux-headers/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=linux-headers
-pkgver=5.10.27
+pkgver=5.10.41
_kernver=${pkgver%.*}
pkgrel=0
pkgdesc="Linux system headers"
@@ -14,6 +14,7 @@ source="https://kernel.org/pub/linux/kernel/v5.x/linux-$_kernver.tar.xz
revert-broken-uapi.patch
0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch
include-uapi-linux-swab-Fix-potentially-missing-__always_inline.patch
+ add-btf-float-uapi.patch
"
builddir="$srcdir/linux-$_kernver"
@@ -47,8 +48,11 @@ package() {
rm -rf "$pkgdir"/usr/include/drm
}
-sha512sums="95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e linux-5.10.tar.xz
-fb18bbd9cfac84e438ea00e3a1a8e9e2a74ea91da57c3ed0f87c0028ffaa7be88be9b5c2f382ac4be06ff468b187480f719eed4df7b38bf9f7beaeddb352c0eb patch-5.10.27.xz
+sha512sums="
+95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e linux-5.10.tar.xz
+58164cd7a7f75b5de01affc61795f3f9386f9e4adfcc71ea8a4f03ffe34c1ec33e48f9c537a456a06afad2cdd9af672485c51ecff0fa495ef7f72f5ee2b5fa6f patch-5.10.41.xz
32597f2672d1ec365a936d15041a7cf219ef9353241d4a5c378244cf2fc155610443a19bbcd391c86099a0b08486c45e042ec7c90b0d04fe675c3ad0ffc36b53 revert-broken-uapi.patch
607c074d72aca88fea9ecdbd62198d8f7857daca75e5d027966e0a9997338d6ac8ce0a1e9114b19232b390751d05acca09e28b0cfad2a12d5942f5575a9f4684 0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch
-7cfa786144009c52d682e307bb512156e4812d7abe03b3fed99651a02d80567d47ee6f347f88d083c1b9805e0c09625fc3df08a8d0ae96b169d24eb5b83917b7 include-uapi-linux-swab-Fix-potentially-missing-__always_inline.patch"
+7cfa786144009c52d682e307bb512156e4812d7abe03b3fed99651a02d80567d47ee6f347f88d083c1b9805e0c09625fc3df08a8d0ae96b169d24eb5b83917b7 include-uapi-linux-swab-Fix-potentially-missing-__always_inline.patch
+256993af76a95ef87cd0882808d5099d55ac0c240e8558851d3c1d5b83228a3c903196e9fe54251d5e3196ba2bef72e1460ddb4aa129a823804b05b5f7581dbd add-btf-float-uapi.patch
+"
diff --git a/main/linux-headers/add-btf-float-uapi.patch b/main/linux-headers/add-btf-float-uapi.patch
new file mode 100644
index 0000000000..ba2cb008dd
--- /dev/null
+++ b/main/linux-headers/add-btf-float-uapi.patch
@@ -0,0 +1,38 @@
+From 473899d4f7c8c563d5c4e03bd52dc8dd18ba583a Mon Sep 17 00:00:00 2001
+From: Ilya Leoshkevich <iii@linux.ibm.com>
+Date: Fri, 26 Feb 2021 21:22:47 +0100
+Subject: [PATCH] bpf: Add BTF_KIND_FLOAT to uapi
+
+Add a new kind value and expand the kind bitfield.
+
+Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
+Signed-off-by: Alexei Starovoitov <ast@kernel.org>
+Acked-by: Yonghong Song <yhs@fb.com>
+Link: https://lore.kernel.org/bpf/20210226202256.116518-2-iii@linux.ibm.com
+---
+ include/uapi/linux/btf.h | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/include/uapi/linux/btf.h b/include/uapi/linux/btf.h
+index 5a667107..d27b1708 100644
+--- a/include/uapi/linux/btf.h
++++ b/include/uapi/linux/btf.h
+@@ -52,7 +52,7 @@ struct btf_type {
+ };
+ };
+
+-#define BTF_INFO_KIND(info) (((info) >> 24) & 0x0f)
++#define BTF_INFO_KIND(info) (((info) >> 24) & 0x1f)
+ #define BTF_INFO_VLEN(info) ((info) & 0xffff)
+ #define BTF_INFO_KFLAG(info) ((info) >> 31)
+
+@@ -72,7 +72,8 @@ struct btf_type {
+ #define BTF_KIND_FUNC_PROTO 13 /* Function Proto */
+ #define BTF_KIND_VAR 14 /* Variable */
+ #define BTF_KIND_DATASEC 15 /* Section */
+-#define BTF_KIND_MAX BTF_KIND_DATASEC
++#define BTF_KIND_FLOAT 16 /* Floating point */
++#define BTF_KIND_MAX BTF_KIND_FLOAT
+ #define NR_BTF_KINDS (BTF_KIND_MAX + 1)
+
+ /* For some specific BTF_KIND, "struct btf_type" is immediately