drop efi patch for older kernels

diff --git a/queue-5.10/efi-add-missing-static-initializer-for-efi_mm-cpus_allowed_lock.patch b/queue-5.10/efi-add-missing-static-initializer-for-efi_mm-cpus_allowed_lock.patch
deleted file mode 100644 (file)
index 476b3bb..0000000
--- a/queue-5.10/efi-add-missing-static-initializer-for-efi_mm-cpus_allowed_lock.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 40374d308e4e456048d83991e937f13fc8bda8bf Mon Sep 17 00:00:00 2001
-From: Ard Biesheuvel <ardb@kernel.org>
-Date: Wed, 15 Oct 2025 22:56:36 +0200
-Subject: efi: Add missing static initializer for efi_mm::cpus_allowed_lock
-
-From: Ard Biesheuvel <ardb@kernel.org>
-
-commit 40374d308e4e456048d83991e937f13fc8bda8bf upstream.
-
-Initialize the cpus_allowed_lock struct member of efi_mm.
-
-Cc: stable@vger.kernel.org
-Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
-Acked-by: Catalin Marinas <catalin.marinas@arm.com>
-Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/firmware/efi/efi.c |    3 +++
- 1 file changed, 3 insertions(+)
-
---- a/drivers/firmware/efi/efi.c
-+++ b/drivers/firmware/efi/efi.c
-@@ -62,6 +62,9 @@ struct mm_struct efi_mm = {
-       .page_table_lock        = __SPIN_LOCK_UNLOCKED(efi_mm.page_table_lock),
-       .mmlist                 = LIST_HEAD_INIT(efi_mm.mmlist),
-       .cpu_bitmap             = { [BITS_TO_LONGS(NR_CPUS)] = 0},
-+#ifdef CONFIG_SCHED_MM_CID
-+      .cpus_allowed_lock      = __RAW_SPIN_LOCK_UNLOCKED(efi_mm.cpus_allowed_lock),
-+#endif
- };
- 
- struct workqueue_struct *efi_rts_wq;

diff --git a/queue-5.10/series b/queue-5.10/series
index b8bd1fc30851c275d03cc02012fa0f34b881da67..45cf5765951d537e935cbfdc497a4428b3864e5f 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -219,7 +219,6 @@ serial-sprd-return-eprobe_defer-when-uart-clock-is-n.patch
 nvme-fc-don-t-hold-rport-lock-when-putting-ctrl.patch
 block-rnbd-clt-fix-signedness-bug-in-init_dev.patch
 vhost-vsock-improve-rcu-read-sections-around-vhost_v.patch
-efi-add-missing-static-initializer-for-efi_mm-cpus_allowed_lock.patch
 lib-crypto-x86-blake2s-fix-32-bit-arg-treated-as-64-bit.patch
 floppy-fix-for-page_size-4kb.patch
 ktest.pl-fix-uninitialized-var-in-config-bisect.pl.patch

diff --git a/queue-5.15/efi-add-missing-static-initializer-for-efi_mm-cpus_allowed_lock.patch b/queue-5.15/efi-add-missing-static-initializer-for-efi_mm-cpus_allowed_lock.patch
deleted file mode 100644 (file)
index 476b3bb..0000000
--- a/queue-5.15/efi-add-missing-static-initializer-for-efi_mm-cpus_allowed_lock.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 40374d308e4e456048d83991e937f13fc8bda8bf Mon Sep 17 00:00:00 2001
-From: Ard Biesheuvel <ardb@kernel.org>
-Date: Wed, 15 Oct 2025 22:56:36 +0200
-Subject: efi: Add missing static initializer for efi_mm::cpus_allowed_lock
-
-From: Ard Biesheuvel <ardb@kernel.org>
-
-commit 40374d308e4e456048d83991e937f13fc8bda8bf upstream.
-
-Initialize the cpus_allowed_lock struct member of efi_mm.
-
-Cc: stable@vger.kernel.org
-Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
-Acked-by: Catalin Marinas <catalin.marinas@arm.com>
-Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/firmware/efi/efi.c |    3 +++
- 1 file changed, 3 insertions(+)
-
---- a/drivers/firmware/efi/efi.c
-+++ b/drivers/firmware/efi/efi.c
-@@ -62,6 +62,9 @@ struct mm_struct efi_mm = {
-       .page_table_lock        = __SPIN_LOCK_UNLOCKED(efi_mm.page_table_lock),
-       .mmlist                 = LIST_HEAD_INIT(efi_mm.mmlist),
-       .cpu_bitmap             = { [BITS_TO_LONGS(NR_CPUS)] = 0},
-+#ifdef CONFIG_SCHED_MM_CID
-+      .cpus_allowed_lock      = __RAW_SPIN_LOCK_UNLOCKED(efi_mm.cpus_allowed_lock),
-+#endif
- };
- 
- struct workqueue_struct *efi_rts_wq;

diff --git a/queue-5.15/series b/queue-5.15/series
index deda36aa3eca82ca8c62668adf48c1d74d03c194..eafe37ac0178879e4a4da2d4dcac355e0e3bec03 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -275,7 +275,6 @@ platform-x86-intel-hid-add-dell-pro-rugged-10-12-tab.patch
 vhost-vsock-improve-rcu-read-sections-around-vhost_v.patch
 keys-trusted-fix-a-memory-leak-in-tpm2_load_cmd.patch
 mmc-sdhci-msm-avoid-early-clock-doubling-during-hs400-transition.patch
-efi-add-missing-static-initializer-for-efi_mm-cpus_allowed_lock.patch
 lib-crypto-x86-blake2s-fix-32-bit-arg-treated-as-64-bit.patch
 block-rate-limit-capacity-change-info-log.patch
 floppy-fix-for-page_size-4kb.patch

diff --git a/queue-6.1/efi-add-missing-static-initializer-for-efi_mm-cpus_allowed_lock.patch b/queue-6.1/efi-add-missing-static-initializer-for-efi_mm-cpus_allowed_lock.patch
deleted file mode 100644 (file)
index 579fb54..0000000
--- a/queue-6.1/efi-add-missing-static-initializer-for-efi_mm-cpus_allowed_lock.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 40374d308e4e456048d83991e937f13fc8bda8bf Mon Sep 17 00:00:00 2001
-From: Ard Biesheuvel <ardb@kernel.org>
-Date: Wed, 15 Oct 2025 22:56:36 +0200
-Subject: efi: Add missing static initializer for efi_mm::cpus_allowed_lock
-
-From: Ard Biesheuvel <ardb@kernel.org>
-
-commit 40374d308e4e456048d83991e937f13fc8bda8bf upstream.
-
-Initialize the cpus_allowed_lock struct member of efi_mm.
-
-Cc: stable@vger.kernel.org
-Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
-Acked-by: Catalin Marinas <catalin.marinas@arm.com>
-Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/firmware/efi/efi.c |    3 +++
- 1 file changed, 3 insertions(+)
-
---- a/drivers/firmware/efi/efi.c
-+++ b/drivers/firmware/efi/efi.c
-@@ -67,6 +67,9 @@ struct mm_struct efi_mm = {
-       .page_table_lock        = __SPIN_LOCK_UNLOCKED(efi_mm.page_table_lock),
-       .mmlist                 = LIST_HEAD_INIT(efi_mm.mmlist),
-       .cpu_bitmap             = { [BITS_TO_LONGS(NR_CPUS)] = 0},
-+#ifdef CONFIG_SCHED_MM_CID
-+      .cpus_allowed_lock      = __RAW_SPIN_LOCK_UNLOCKED(efi_mm.cpus_allowed_lock),
-+#endif
- };
- 
- struct workqueue_struct *efi_rts_wq;

diff --git a/queue-6.1/series b/queue-6.1/series
index 6906527a9020dd6baf1acee8df8f2de36fd9a6f5..a0670202715fa810ea7abb3c88742956777a2315 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -317,7 +317,6 @@ block-rnbd-clt-fix-signedness-bug-in-init_dev.patch
 vhost-vsock-improve-rcu-read-sections-around-vhost_v.patch
 keys-trusted-fix-a-memory-leak-in-tpm2_load_cmd.patch
 mmc-sdhci-msm-avoid-early-clock-doubling-during-hs400-transition.patch
-efi-add-missing-static-initializer-for-efi_mm-cpus_allowed_lock.patch
 lib-crypto-x86-blake2s-fix-32-bit-arg-treated-as-64-bit.patch
 s390-dasd-fix-gendisk-parent-after-copy-pair-swap.patch
 block-rate-limit-capacity-change-info-log.patch