diff options
Diffstat (limited to 'pkg/linux-headers/patch')
| -rw-r--r-- | pkg/linux-headers/patch/0002-Revert-change-of-BPF_F_-to-enum-constants.patch | 8 | ||||
| -rw-r--r-- | pkg/linux-headers/patch/0003-Prevent-zero-length-array-members-in-asound.h.patch | 10 | ||||
| -rw-r--r-- | pkg/linux-headers/patch/0004-Make-struct-bpf_timer-include-a-named-member.patch | 32 | ||||
| -rw-r--r-- | pkg/linux-headers/patch/0004-nfc-uapi-remove-stray-semicolon-in-struct-declaratio.patch (renamed from pkg/linux-headers/patch/0005-nfc-uapi-remove-stray-semicolon-in-struct-declaratio.patch) | 0 |
4 files changed, 9 insertions, 41 deletions
diff --git a/pkg/linux-headers/patch/0002-Revert-change-of-BPF_F_-to-enum-constants.patch b/pkg/linux-headers/patch/0002-Revert-change-of-BPF_F_-to-enum-constants.patch index 2b93074e..1ce46281 100644 --- a/pkg/linux-headers/patch/0002-Revert-change-of-BPF_F_-to-enum-constants.patch +++ b/pkg/linux-headers/patch/0002-Revert-change-of-BPF_F_-to-enum-constants.patch @@ -1,4 +1,4 @@ -From e373a645de1b2e57878dc17420dad3d0464694e6 Mon Sep 17 00:00:00 2001 +From 72b27c48f468c547dcd93beae9041417c05ef655 Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Tue, 2 Jun 2020 03:56:03 -0700 Subject: [PATCH] Revert change of BPF_F_* to enum constants @@ -8,10 +8,10 @@ Subject: [PATCH] Revert change of BPF_F_* to enum constants 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h -index c994ff5b157c..ed8261560f2b 100644 +index 754e68ca8744..11bef290a69e 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h -@@ -5850,12 +5850,10 @@ enum { +@@ -5970,12 +5970,10 @@ enum { /* BPF_FUNC_perf_event_output, BPF_FUNC_perf_event_read and * BPF_FUNC_perf_event_read_value flags. */ @@ -28,5 +28,5 @@ index c994ff5b157c..ed8261560f2b 100644 /* Current network namespace */ enum { -- -2.37.3 +2.44.0 diff --git a/pkg/linux-headers/patch/0003-Prevent-zero-length-array-members-in-asound.h.patch b/pkg/linux-headers/patch/0003-Prevent-zero-length-array-members-in-asound.h.patch index 705145f6..1b6d56a8 100644 --- a/pkg/linux-headers/patch/0003-Prevent-zero-length-array-members-in-asound.h.patch +++ b/pkg/linux-headers/patch/0003-Prevent-zero-length-array-members-in-asound.h.patch @@ -1,4 +1,4 @@ -From 4d7aad2421c783cf57f359638197f0ad2a32a287 Mon Sep 17 00:00:00 2001 +From 069cbc8a25155771af775ee084ba3519ed5a9602 Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Mon, 30 Aug 2021 19:26:32 -0700 Subject: [PATCH] Prevent zero-length array members in asound.h @@ -8,10 +8,10 @@ Subject: [PATCH] Prevent zero-length array members in asound.h 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/include/uapi/sound/asound.h b/include/uapi/sound/asound.h -index 0aa955aa8246..2e7ca9236c7a 100644 +index 628d46a0da92..23b0d301e83f 100644 --- a/include/uapi/sound/asound.h +++ b/include/uapi/sound/asound.h -@@ -550,22 +550,30 @@ struct __snd_pcm_sync_ptr { +@@ -557,22 +557,30 @@ struct __snd_pcm_sync_ptr { } c; }; @@ -48,7 +48,7 @@ index 0aa955aa8246..2e7ca9236c7a 100644 struct __snd_timespec64 tstamp; /* Timestamp */ snd_pcm_state_t suspended_state;/* RO: suspended stream state */ __u32 pad3; /* Needed for 64 bit alignment */ -@@ -573,16 +581,19 @@ struct __snd_pcm_mmap_status64 { +@@ -580,16 +588,19 @@ struct __snd_pcm_mmap_status64 { }; struct __snd_pcm_mmap_control64 { @@ -73,5 +73,5 @@ index 0aa955aa8246..2e7ca9236c7a 100644 __u32 flags; __u32 pad1; -- -2.37.3 +2.44.0 diff --git a/pkg/linux-headers/patch/0004-Make-struct-bpf_timer-include-a-named-member.patch b/pkg/linux-headers/patch/0004-Make-struct-bpf_timer-include-a-named-member.patch deleted file mode 100644 index 5835966a..00000000 --- a/pkg/linux-headers/patch/0004-Make-struct-bpf_timer-include-a-named-member.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 3685e3c0cb5029b4e17eee6a53d2214190738c24 Mon Sep 17 00:00:00 2001 -From: Michael Forney <mforney@mforney.org> -Date: Thu, 2 Dec 2021 14:49:08 -0800 -Subject: [PATCH] Make struct bpf_timer include a named member - -A struct without any named members is undefined behavior by C11 -6.7.2.1p8. - -Signed-off-by: Michael Forney <mforney@mforney.org> ---- - include/uapi/linux/bpf.h | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h -index ed8261560f2b..fb60bc7bb305 100644 ---- a/include/uapi/linux/bpf.h -+++ b/include/uapi/linux/bpf.h -@@ -6968,9 +6968,8 @@ struct bpf_spin_lock { - }; - - struct bpf_timer { -- __u64 :64; -- __u64 :64; --} __attribute__((aligned(8))); -+ __u64 reserved[2]; -+}; - - struct bpf_dynptr { - __u64 :64; --- -2.37.3 - diff --git a/pkg/linux-headers/patch/0005-nfc-uapi-remove-stray-semicolon-in-struct-declaratio.patch b/pkg/linux-headers/patch/0004-nfc-uapi-remove-stray-semicolon-in-struct-declaratio.patch index 05de68d2..05de68d2 100644 --- a/pkg/linux-headers/patch/0005-nfc-uapi-remove-stray-semicolon-in-struct-declaratio.patch +++ b/pkg/linux-headers/patch/0004-nfc-uapi-remove-stray-semicolon-in-struct-declaratio.patch |