diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2019-08-30 12:06:30 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-09-01 22:33:07 +0100 |
commit | 8352682c3b91edf2136e35f79777c80d5c7dea31 (patch) | |
tree | 1bda0d87d229036e5d1ce03af467373841b2105e /meta/recipes-kernel | |
parent | 77a8ddd87c20a1736d9777f94f42f349b8a7d7ff (diff) | |
download | poky-8352682c3b91edf2136e35f79777c80d5c7dea31.tar.gz |
linux-libc-headers: update to v5.2 headers
We drop the patch 0001-arm64-sve-uapi-asm-ptrace.h-should-not-depend-on-uap.patch
since it was a backport and is already part of the 5.2 headers
(From OE-Core rev: c436abca9832f1aa93f30c8d6ff36471d7bc4ca9)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r-- | meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-arm64-sve-uapi-asm-ptrace.h-should-not-depend-on-uap.patch | 62 | ||||
-rw-r--r-- | meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.2.bb (renamed from meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.0.bb) | 5 |
2 files changed, 2 insertions, 65 deletions
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-arm64-sve-uapi-asm-ptrace.h-should-not-depend-on-uap.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-arm64-sve-uapi-asm-ptrace.h-should-not-depend-on-uap.patch deleted file mode 100644 index 5ea46e9590..0000000000 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-arm64-sve-uapi-asm-ptrace.h-should-not-depend-on-uap.patch +++ /dev/null | |||
@@ -1,62 +0,0 @@ | |||
1 | From 35341ca0614ab13e1ef34ad4f29a39e15ef31fa8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Anisse Astier <aastier@freebox.fr> | ||
3 | Date: Mon, 17 Jun 2019 15:22:22 +0200 | ||
4 | Subject: [PATCH] arm64/sve: <uapi/asm/ptrace.h> should not depend on | ||
5 | <uapi/linux/prctl.h> | ||
6 | |||
7 | Pulling linux/prctl.h into asm/ptrace.h in the arm64 UAPI headers causes | ||
8 | userspace build issues for any program (e.g. strace and qemu) that | ||
9 | includes both <sys/prctl.h> and <linux/ptrace.h> when using musl libc: | ||
10 | |||
11 | | error: redefinition of 'struct prctl_mm_map' | ||
12 | | struct prctl_mm_map { | ||
13 | |||
14 | See https://github.com/foundriesio/meta-lmp/commit/6d4a106e191b5d79c41b9ac78fd321316d3013c0 | ||
15 | for a public example of people working around this issue. | ||
16 | |||
17 | Although it's a bit grotty, fix this breakage by duplicating the prctl | ||
18 | constant definitions. Since these are part of the kernel ABI, they | ||
19 | cannot be changed in future and so it's not the end of the world to have | ||
20 | them open-coded. | ||
21 | |||
22 | Fixes: 43d4da2c45b2 ("arm64/sve: ptrace and ELF coredump support") | ||
23 | |||
24 | Upstream-Status: Backport [https://github.com/torvalds/linux/commit/35341ca0614ab13e1ef34ad4f29a39e15ef31fa8] | ||
25 | Cc: stable@vger.kernel.org | ||
26 | Acked-by: Dave Martin <Dave.Martin@arm.com> | ||
27 | Signed-off-by: Anisse Astier <aastier@freebox.fr> | ||
28 | Signed-off-by: Will Deacon <will.deacon@arm.com> | ||
29 | --- | ||
30 | arch/arm64/include/uapi/asm/ptrace.h | 8 +++----- | ||
31 | 1 file changed, 3 insertions(+), 5 deletions(-) | ||
32 | |||
33 | diff --git a/arch/arm64/include/uapi/asm/ptrace.h b/arch/arm64/include/uapi/asm/ptrace.h | ||
34 | index 97c53203150b..e932284993d4 100644 | ||
35 | --- a/arch/arm64/include/uapi/asm/ptrace.h | ||
36 | +++ b/arch/arm64/include/uapi/asm/ptrace.h | ||
37 | @@ -65,8 +65,6 @@ | ||
38 | |||
39 | #ifndef __ASSEMBLY__ | ||
40 | |||
41 | -#include <linux/prctl.h> | ||
42 | - | ||
43 | /* | ||
44 | * User structures for general purpose, floating point and debug registers. | ||
45 | */ | ||
46 | @@ -113,10 +111,10 @@ struct user_sve_header { | ||
47 | |||
48 | /* | ||
49 | * Common SVE_PT_* flags: | ||
50 | - * These must be kept in sync with prctl interface in <linux/ptrace.h> | ||
51 | + * These must be kept in sync with prctl interface in <linux/prctl.h> | ||
52 | */ | ||
53 | -#define SVE_PT_VL_INHERIT (PR_SVE_VL_INHERIT >> 16) | ||
54 | -#define SVE_PT_VL_ONEXEC (PR_SVE_SET_VL_ONEXEC >> 16) | ||
55 | +#define SVE_PT_VL_INHERIT ((1 << 17) /* PR_SVE_VL_INHERIT */ >> 16) | ||
56 | +#define SVE_PT_VL_ONEXEC ((1 << 18) /* PR_SVE_SET_VL_ONEXEC */ >> 16) | ||
57 | |||
58 | |||
59 | /* | ||
60 | -- | ||
61 | 2.22.0 | ||
62 | |||
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.0.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.2.bb index 473688d95f..9d18df76c6 100644 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.0.bb +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.2.bb | |||
@@ -12,8 +12,7 @@ SRC_URI_append_libc-musl = "\ | |||
12 | SRC_URI_append = "\ | 12 | SRC_URI_append = "\ |
13 | file://0001-scripts-Use-fixed-input-and-output-files-instead-of-.patch \ | 13 | file://0001-scripts-Use-fixed-input-and-output-files-instead-of-.patch \ |
14 | file://0001-kbuild-install_headers.sh-Strip-_UAPI-from-if-define.patch \ | 14 | file://0001-kbuild-install_headers.sh-Strip-_UAPI-from-if-define.patch \ |
15 | file://0001-arm64-sve-uapi-asm-ptrace.h-should-not-depend-on-uap.patch \ | ||
16 | " | 15 | " |
17 | 16 | ||
18 | SRC_URI[md5sum] = "7381ce8aac80a01448e065ce795c19c0" | 17 | SRC_URI[md5sum] = "ddf994de00d7b18395886dd9b30b9262" |
19 | SRC_URI[sha256sum] = "437b141a6499159f5a7282d5eb4b2be055f8e862ccce44d7464e8759c31a2e43" | 18 | SRC_URI[sha256sum] = "54ad66f672e1a831b574f5e704e8a05f1e6180a8245d4bdd811208a6cb0ac1e7" |