linux-headers: Update to 6.4

5 files changed, 13 insertions, 67 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 71235b19..2b93074e 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 0fc94dce04b2699087f4b2472c7bcc44d24c0cff Mon Sep 17 00:00:00 2001
+From e373a645de1b2e57878dc17420dad3d0464694e6 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 51b9aa640ad2..ae026feb4c5b 100644
+index c994ff5b157c..ed8261560f2b 100644
 --- a/include/uapi/linux/bpf.h
 +++ b/include/uapi/linux/bpf.h
-@@ -5717,12 +5717,10 @@ enum {
+@@ -5850,12 +5850,10 @@ enum {
  /* BPF_FUNC_perf_event_output, BPF_FUNC_perf_event_read and
   * BPF_FUNC_perf_event_read_value flags.
   */
diff --git a/pkg/linux-headers/patch/0004-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 0039b03c..705145f6 100644
--- a/pkg/linux-headers/patch/0004-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 d3ae5dd27d8158e810c093b85dc4c7df88f01c5d Mon Sep 17 00:00:00 2001
+From 4d7aad2421c783cf57f359638197f0ad2a32a287 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 de6810e94abe..a57304e141ff 100644
+index 0aa955aa8246..2e7ca9236c7a 100644
 --- a/include/uapi/sound/asound.h
 +++ b/include/uapi/sound/asound.h
-@@ -545,22 +545,30 @@ struct __snd_pcm_sync_ptr {
+@@ -550,22 +550,30 @@ struct __snd_pcm_sync_ptr {
  	} c;
  };
  
@@ -48,15 +48,16 @@ index de6810e94abe..a57304e141ff 100644
  	struct __snd_timespec64 tstamp;	/* Timestamp */
  	snd_pcm_state_t suspended_state;/* RO: suspended stream state */
  	__u32 pad3;			/* Needed for 64 bit alignment */
-@@ -568,15 +576,18 @@ struct __snd_pcm_mmap_status64 {
+@@ -573,16 +581,19 @@ struct __snd_pcm_mmap_status64 {
  };
  
  struct __snd_pcm_mmap_control64 {
 -	__pad_before_uframe __pad1;
 +	__PAD_BEFORE_UFRAME(__pad1)
  	snd_pcm_uframes_t appl_ptr;	 /* RW: appl ptr (0...boundary-1) */
--	__pad_before_uframe __pad2;
-+	__PAD_BEFORE_UFRAME(__pad2)
+-	__pad_before_uframe __pad2;	 // This should be __pad_after_uframe, but binary
++	__PAD_BEFORE_UFRAME(__pad2)	 // This should be __pad_after_uframe, but binary
+ 					 // backwards compatibility constraints prevent a fix.
  
 -	__pad_before_uframe __pad3;
 +	__PAD_BEFORE_UFRAME(__pad3)
diff --git a/pkg/linux-headers/patch/0003-include-uapi-linux-swab-Fix-potentially-missing-__al.patch b/pkg/linux-headers/patch/0003-include-uapi-linux-swab-Fix-potentially-missing-__al.patch
deleted file mode 100644
index 5e464ef9..00000000
--- a/pkg/linux-headers/patch/0003-include-uapi-linux-swab-Fix-potentially-missing-__al.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From f9d4ca2669a3f5b5f47de1bc31129fa2dd6f1597 Mon Sep 17 00:00:00 2001
-From: Matt Redfearn <matt.redfearn@mips.com>
-Date: Thu, 29 Apr 2021 01:14:38 -0700
-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.31.1
-
diff --git a/pkg/linux-headers/patch/0005-Make-struct-bpf_timer-include-a-named-member.patch b/pkg/linux-headers/patch/0004-Make-struct-bpf_timer-include-a-named-member.patch
index d742aa04..5835966a 100644
--- a/pkg/linux-headers/patch/0005-Make-struct-bpf_timer-include-a-named-member.patch
+++ b/pkg/linux-headers/patch/0004-Make-struct-bpf_timer-include-a-named-member.patch
@@ -1,4 +1,4 @@
-From c57c6e0abe79f908eaac16deac7cdb51a58dc2c4 Mon Sep 17 00:00:00 2001
+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
@@ -12,10 +12,10 @@ Signed-off-by: Michael Forney <mforney@mforney.org>
  1 file changed, 2 insertions(+), 3 deletions(-)
 
 diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
-index ae026feb4c5b..a41109d08558 100644
+index ed8261560f2b..fb60bc7bb305 100644
 --- a/include/uapi/linux/bpf.h
 +++ b/include/uapi/linux/bpf.h
-@@ -6822,9 +6822,8 @@ struct bpf_spin_lock {
+@@ -6968,9 +6968,8 @@ struct bpf_spin_lock {
  };
  
  struct bpf_timer {
diff --git a/pkg/linux-headers/patch/0006-nfc-uapi-remove-stray-semicolon-in-struct-declaratio.patch b/pkg/linux-headers/patch/0005-nfc-uapi-remove-stray-semicolon-in-struct-declaratio.patch
index 05de68d2..05de68d2 100644
--- a/pkg/linux-headers/patch/0006-nfc-uapi-remove-stray-semicolon-in-struct-declaratio.patch
+++ b/pkg/linux-headers/patch/0005-nfc-uapi-remove-stray-semicolon-in-struct-declaratio.patch