drop s390 patch that broke the build

diff --git a/queue-6.10/s390-mm-prevent-lowcore-vs-identity-mapping-overlap.patch b/queue-6.10/s390-mm-prevent-lowcore-vs-identity-mapping-overlap.patch
deleted file mode 100644 (file)
index 49e968d..0000000
--- a/queue-6.10/s390-mm-prevent-lowcore-vs-identity-mapping-overlap.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From f099121f10218f5869c62e7c3d6b122a35c64b90 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 9 Aug 2024 08:47:15 +0200
-Subject: s390/mm: Prevent lowcore vs identity mapping overlap
-
-From: Alexander Gordeev <agordeev@linux.ibm.com>
-
-[ Upstream commit a3ca27c405faad584af6e8e38cdafe5be73230a1 ]
-
-The identity mapping position in virtual memory is randomized
-together with the kernel mapping. That position can never
-overlap with the lowcore even when the lowcore is relocated.
-
-Prevent overlapping with the lowcore to allow independent
-positioning of the identity mapping. With the current value
-of the alternative lowcore address of 0x70000 the overlap
-could happen in case the identity mapping is placed at zero.
-
-This is a prerequisite for uncoupling of randomization base
-of kernel image and identity mapping in virtual memory.
-
-Acked-by: Vasily Gorbik <gor@linux.ibm.com>
-Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>
-Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/s390/kernel/setup.c | 19 ++++++++++++++++++-
- 1 file changed, 18 insertions(+), 1 deletion(-)
-
-diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
-index 610e6f794511..4b1afd8ac3ee 100644
---- a/arch/s390/kernel/setup.c
-+++ b/arch/s390/kernel/setup.c
-@@ -734,7 +734,23 @@ static void __init memblock_add_physmem_info(void)
- }
- 
- /*
-- * Reserve memory used for lowcore/command line/kernel image.
-+ * Reserve memory used for lowcore.
-+ */
-+static void __init reserve_lowcore(void)
-+{
-+      void *lowcore_start = get_lowcore();
-+      void *lowcore_end = lowcore_start + sizeof(struct lowcore);
-+      void *start, *end;
-+
-+      if ((void *)__identity_base < lowcore_end) {
-+              start = max(lowcore_start, (void *)__identity_base);
-+              end = min(lowcore_end, (void *)(__identity_base + ident_map_size));
-+              memblock_reserve(__pa(start), __pa(end));
-+      }
-+}
-+
-+/*
-+ * Reserve memory used for absolute lowcore/command line/kernel image.
-  */
- static void __init reserve_kernel(void)
- {
-@@ -915,6 +931,7 @@ void __init setup_arch(char **cmdline_p)
- 
-       /* Do some memory reservations *before* memory is added to memblock */
-       reserve_pgtables();
-+      reserve_lowcore();
-       reserve_kernel();
-       reserve_initrd();
-       reserve_certificate_list();
--- 
-2.43.0
-

diff --git a/queue-6.10/series b/queue-6.10/series
index 78d9b7e94fabe30bb0eefd8e73777cd1aa897013..603d5bf420741c57a121cbc9ecff0e16947fa7b3 100644 (file)
--- a/queue-6.10/series
+++ b/queue-6.10/series
@@ -35,7 +35,6 @@ input-i8042-add-fujitsu-lifebook-e756-to-i8042-quirk.patch
 drm-xe-xe2lpm-extend-wa_16021639441.patch
 drm-xe-fix-wa-14018094691.patch
 drm-xe-use-devm-instead-of-drmm-for-managed-bo.patch
-s390-mm-prevent-lowcore-vs-identity-mapping-overlap.patch
 s390-mm-pin-identity-mapping-base-to-zero.patch
 smb-server-fix-return-value-of-smb2_open.patch
 nfsv4-fix-clearing-of-layout-segments-in-layoutretur.patch

diff --git a/queue-6.6/s390-mm-prevent-lowcore-vs-identity-mapping-overlap.patch b/queue-6.6/s390-mm-prevent-lowcore-vs-identity-mapping-overlap.patch
deleted file mode 100644 (file)
index 9092974..0000000
--- a/queue-6.6/s390-mm-prevent-lowcore-vs-identity-mapping-overlap.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 4b415d5497099086b01b2e99a38c1b956f13db7f Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 9 Aug 2024 08:47:15 +0200
-Subject: s390/mm: Prevent lowcore vs identity mapping overlap
-
-From: Alexander Gordeev <agordeev@linux.ibm.com>
-
-[ Upstream commit a3ca27c405faad584af6e8e38cdafe5be73230a1 ]
-
-The identity mapping position in virtual memory is randomized
-together with the kernel mapping. That position can never
-overlap with the lowcore even when the lowcore is relocated.
-
-Prevent overlapping with the lowcore to allow independent
-positioning of the identity mapping. With the current value
-of the alternative lowcore address of 0x70000 the overlap
-could happen in case the identity mapping is placed at zero.
-
-This is a prerequisite for uncoupling of randomization base
-of kernel image and identity mapping in virtual memory.
-
-Acked-by: Vasily Gorbik <gor@linux.ibm.com>
-Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>
-Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/s390/kernel/setup.c | 19 ++++++++++++++++++-
- 1 file changed, 18 insertions(+), 1 deletion(-)
-
-diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
-index d48c7afe97e6..89fe0764af84 100644
---- a/arch/s390/kernel/setup.c
-+++ b/arch/s390/kernel/setup.c
-@@ -741,7 +741,23 @@ static void __init memblock_add_physmem_info(void)
- }
- 
- /*
-- * Reserve memory used for lowcore/command line/kernel image.
-+ * Reserve memory used for lowcore.
-+ */
-+static void __init reserve_lowcore(void)
-+{
-+      void *lowcore_start = get_lowcore();
-+      void *lowcore_end = lowcore_start + sizeof(struct lowcore);
-+      void *start, *end;
-+
-+      if ((void *)__identity_base < lowcore_end) {
-+              start = max(lowcore_start, (void *)__identity_base);
-+              end = min(lowcore_end, (void *)(__identity_base + ident_map_size));
-+              memblock_reserve(__pa(start), __pa(end));
-+      }
-+}
-+
-+/*
-+ * Reserve memory used for absolute lowcore/command line/kernel image.
-  */
- static void __init reserve_kernel(void)
- {
-@@ -939,6 +955,7 @@ void __init setup_arch(char **cmdline_p)
- 
-       /* Do some memory reservations *before* memory is added to memblock */
-       reserve_pgtables();
-+      reserve_lowcore();
-       reserve_kernel();
-       reserve_initrd();
-       reserve_certificate_list();
--- 
-2.43.0
-

diff --git a/queue-6.6/series b/queue-6.6/series
index 7a4a107b71aa875c2bb4b4a42f42b021aed047f0..fe18e2417d6b482fcb58fc2eaa56fb6b70fea874 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -29,7 +29,6 @@ platform-surface-aggregator_registry-add-support-for.patch
 platform-surface-aggregator_registry-add-support-for.patch-10885
 drm-msm-adreno-fix-error-return-if-missing-firmware-.patch
 input-i8042-add-fujitsu-lifebook-e756-to-i8042-quirk.patch
-s390-mm-prevent-lowcore-vs-identity-mapping-overlap.patch
 smb-server-fix-return-value-of-smb2_open.patch
 nfsv4-fix-clearing-of-layout-segments-in-layoutretur.patch
 nfs-avoid-unnecessary-rescanning-of-the-per-server-d.patch