drop queue-5.4/x86-xen-swap-nx-determination-and-gdt-setup-on-bsp.patch

diff --git a/queue-5.4/series b/queue-5.4/series
index 4fcc0d409097d34927b313618407bf28297cad27..60f8920b584343b0ae9479b003d30b60b807e6cc 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -66,5 +66,4 @@ video-hgafb-fix-potential-null-pointer-dereference.patch
 vgacon-record-video-mode-changes-with-vt_resizex.patch
 vt-fix-character-height-handling-with-vt_resizex.patch
 tty-vt-always-invoke-vc-vc_sw-con_resize-callback.patch
-x86-xen-swap-nx-determination-and-gdt-setup-on-bsp.patch
 nvme-multipath-fix-double-initialization-of-ana-state.patch

diff --git a/queue-5.4/x86-xen-swap-nx-determination-and-gdt-setup-on-bsp.patch b/queue-5.4/x86-xen-swap-nx-determination-and-gdt-setup-on-bsp.patch
deleted file mode 100644 (file)
index a2ad450..0000000
--- a/queue-5.4/x86-xen-swap-nx-determination-and-gdt-setup-on-bsp.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From ae897fda4f507e4b239f0bdfd578b3688ca96fb4 Mon Sep 17 00:00:00 2001
-From: Jan Beulich <jbeulich@suse.com>
-Date: Thu, 20 May 2021 13:42:42 +0200
-Subject: x86/Xen: swap NX determination and GDT setup on BSP
-
-From: Jan Beulich <jbeulich@suse.com>
-
-commit ae897fda4f507e4b239f0bdfd578b3688ca96fb4 upstream.
-
-xen_setup_gdt(), via xen_load_gdt_boot(), wants to adjust page tables.
-For this to work when NX is not available, x86_configure_nx() needs to
-be called first.
-
-[jgross] Note that this is a revert of 36104cb9012a82e73 ("x86/xen:
-Delay get_cpu_cap until stack canary is established"), which is possible
-now that we no longer support running as PV guest in 32-bit mode.
-
-Cc: <stable.vger.kernel.org> # 5.9
-Fixes: 36104cb9012a82e73 ("x86/xen: Delay get_cpu_cap until stack canary is established")
-Reported-by: Olaf Hering <olaf@aepfle.de>
-Signed-off-by: Jan Beulich <jbeulich@suse.com>
-Reviewed-by: Juergen Gross <jgross@suse.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
-Link: https://lore.kernel.org/r/12a866b0-9e89-59f7-ebeb-a2a6cec0987a@suse.com
-Signed-off-by: Juergen Gross <jgross@suse.com>
----
- arch/x86/xen/enlighten_pv.c |    8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
---- a/arch/x86/xen/enlighten_pv.c
-+++ b/arch/x86/xen/enlighten_pv.c
-@@ -1243,16 +1243,16 @@ asmlinkage __visible void __init xen_sta
-       /* Get mfn list */
-       xen_build_dynamic_phys_to_machine();
- 
-+      /* Work out if we support NX */
-+      get_cpu_cap(&boot_cpu_data);
-+      x86_configure_nx();
-+
-       /*
-        * Set up kernel GDT and segment registers, mainly so that
-        * -fstack-protector code can be executed.
-        */
-       xen_setup_gdt(0);
- 
--      /* Work out if we support NX */
--      get_cpu_cap(&boot_cpu_data);
--      x86_configure_nx();
--
-       /* Determine virtual and physical address sizes */
-       get_cpu_address_sizes(&boot_cpu_data);
-