drop queue-6.4/mm-disable-config_per_vma_lock-until-its-fixed.patch

diff --git a/queue-6.4/mm-disable-config_per_vma_lock-until-its-fixed.patch b/queue-6.4/mm-disable-config_per_vma_lock-until-its-fixed.patch
deleted file mode 100644 (file)
index 267bad5..0000000
--- a/queue-6.4/mm-disable-config_per_vma_lock-until-its-fixed.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 841878e2ca4600b3ffaf09921cde08f9f944b9f7 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 5 Jul 2023 18:14:00 -0700
-Subject: mm: disable CONFIG_PER_VMA_LOCK until its fixed
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Suren Baghdasaryan <surenb@google.com>
-
-[ Upstream commit f96c48670319d685d18d50819ed0c1ef751ed2ac ]
-
-A memory corruption was reported in [1] with bisection pointing to the
-patch [2] enabling per-VMA locks for x86.  Disable per-VMA locks config to
-prevent this issue until the fix is confirmed.  This is expected to be a
-temporary measure.
-
-[1] https://bugzilla.kernel.org/show_bug.cgi?id=217624
-[2] https://lore.kernel.org/all/20230227173632.3292573-30-surenb@google.com
-
-Link: https://lkml.kernel.org/r/20230706011400.2949242-3-surenb@google.com
-Reported-by: Jiri Slaby <jirislaby@kernel.org>
-Closes: https://lore.kernel.org/all/dbdef34c-3a07-5951-e1ae-e9c6e3cdf51b@kernel.org/
-Reported-by: Jacob Young <jacobly.alt@gmail.com>
-Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217624
-Fixes: 0bff0aaea03e ("x86/mm: try VMA lock-based page fault handling first")
-Signed-off-by: Suren Baghdasaryan <surenb@google.com>
-Cc: David Hildenbrand <david@redhat.com>
-Cc: Holger Hoffstätte <holger@applied-asynchrony.com>
-Cc: <stable@vger.kernel.org>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- mm/Kconfig | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/mm/Kconfig b/mm/Kconfig
-index e3454087fd31a..1d2afc2567d0e 100644
---- a/mm/Kconfig
-+++ b/mm/Kconfig
-@@ -1198,8 +1198,9 @@ config ARCH_SUPPORTS_PER_VMA_LOCK
-        def_bool n
- 
- config PER_VMA_LOCK
--      def_bool y
-+      bool "Enable per-vma locking during page fault handling."
-       depends on ARCH_SUPPORTS_PER_VMA_LOCK && MMU && SMP
-+      depends on BROKEN
-       help
-         Allow per-vma locking during page fault handling.
- 
--- 
-2.40.1
-

diff --git a/queue-6.4/series b/queue-6.4/series
index e38d08d61eb449b290607d3070a75197015cf682..2e99b1bf1254804dd0bd4bd9820cf082166b715a 100644 (file)
--- a/queue-6.4/series
+++ b/queue-6.4/series
@@ -2,7 +2,6 @@ nfsv4.2-fix-error-handling-in-nfs42_proc_getxattr.patch
 nfsv4-fix-out-path-in-__nfs4_get_acl_uncached.patch
 xprtrdma-remap-receive-buffers-after-a-reconnect.patch
 pci-acpiphp-reassign-resources-on-bridge-if-necessar.patch
-mm-disable-config_per_vma_lock-until-its-fixed.patch
 jbd2-remove-t_checkpoint_io_list.patch
 jbd2-remove-journal_clean_one_cp_list.patch
 jbd2-fix-a-race-when-checking-checkpoint-buffer-busy.patch