]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
drop some patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 4 Jul 2024 07:44:35 +0000 (09:44 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 4 Jul 2024 07:44:35 +0000 (09:44 +0200)
12 files changed:
queue-4.19/serial-imx-set-receiver-level-before-starting-uart.patch [deleted file]
queue-4.19/series
queue-5.10/serial-imx-set-receiver-level-before-starting-uart.patch [deleted file]
queue-5.10/series
queue-5.10/x86-mm-numa-use-numa_no_node-when-calling-memblock_s.patch [deleted file]
queue-5.15/serial-imx-set-receiver-level-before-starting-uart.patch [deleted file]
queue-5.15/series
queue-5.15/x86-mm-numa-use-numa_no_node-when-calling-memblock_s.patch [deleted file]
queue-5.4/serial-imx-set-receiver-level-before-starting-uart.patch [deleted file]
queue-5.4/series
queue-6.1/series
queue-6.1/x86-mm-numa-use-numa_no_node-when-calling-memblock_s.patch [deleted file]

diff --git a/queue-4.19/serial-imx-set-receiver-level-before-starting-uart.patch b/queue-4.19/serial-imx-set-receiver-level-before-starting-uart.patch
deleted file mode 100644 (file)
index 21fdc20..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-From a81dbd0463eca317eee44985a66aa6cc2ce5c101 Mon Sep 17 00:00:00 2001
-From: Stefan Eichenberger <stefan.eichenberger@toradex.com>
-Date: Fri, 21 Jun 2024 17:37:49 +0200
-Subject: serial: imx: set receiver level before starting uart
-
-From: Stefan Eichenberger <stefan.eichenberger@toradex.com>
-
-commit a81dbd0463eca317eee44985a66aa6cc2ce5c101 upstream.
-
-Set the receiver level to something > 0 before calling imx_uart_start_rx
-in rs485_config. This is necessary to avoid an interrupt storm that
-might prevent the system from booting. This was seen on an i.MX7 device
-when the rs485-rts-active-low property was active in the device tree.
-
-Fixes: 6d215f83e5fc ("serial: imx: warn user when using unsupported configuration")
-Cc: stable <stable@kernel.org>
-Signed-off-by: Stefan Eichenberger <stefan.eichenberger@toradex.com>
-Link: https://lore.kernel.org/r/20240621153829.183780-1-eichest@gmail.com
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/tty/serial/imx.c |    4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
---- a/drivers/tty/serial/imx.c
-+++ b/drivers/tty/serial/imx.c
-@@ -1860,8 +1860,10 @@ static int imx_uart_rs485_config(struct
-       /* Make sure Rx is enabled in case Tx is active with Rx disabled */
-       if (!(rs485conf->flags & SER_RS485_ENABLED) ||
--          rs485conf->flags & SER_RS485_RX_DURING_TX)
-+          rs485conf->flags & SER_RS485_RX_DURING_TX) {
-+              imx_uart_setup_ufcr(sport, TXTL_DEFAULT, RXTL_DEFAULT);
-               imx_uart_start_rx(port);
-+      }
-       port->rs485 = *rs485conf;
index af05c41f3e4dbaa36a53c219acebd6c97cb8c35f..beebcb68571ba90ba5017bf36062d2af2c6bcabb 100644 (file)
@@ -124,7 +124,6 @@ net-usb-ax88179_178a-improve-link-status-logs.patch
 usb-gadget-printer-ss-support.patch
 usb-musb-da8xx-fix-a-resource-leak-in-probe.patch
 usb-atm-cxacru-fix-endpoint-checking-in-cxacru_bind.patch
-serial-imx-set-receiver-level-before-starting-uart.patch
 tty-mcf-mcf54418-has-10-uarts.patch
 hexagon-fix-fadvise64_64-calling-conventions.patch
 drm-nouveau-dispnv04-fix-null-pointer-dereference-in-nv17_tv_get_ld_modes.patch
diff --git a/queue-5.10/serial-imx-set-receiver-level-before-starting-uart.patch b/queue-5.10/serial-imx-set-receiver-level-before-starting-uart.patch
deleted file mode 100644 (file)
index 1bd7ed0..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-From a81dbd0463eca317eee44985a66aa6cc2ce5c101 Mon Sep 17 00:00:00 2001
-From: Stefan Eichenberger <stefan.eichenberger@toradex.com>
-Date: Fri, 21 Jun 2024 17:37:49 +0200
-Subject: serial: imx: set receiver level before starting uart
-
-From: Stefan Eichenberger <stefan.eichenberger@toradex.com>
-
-commit a81dbd0463eca317eee44985a66aa6cc2ce5c101 upstream.
-
-Set the receiver level to something > 0 before calling imx_uart_start_rx
-in rs485_config. This is necessary to avoid an interrupt storm that
-might prevent the system from booting. This was seen on an i.MX7 device
-when the rs485-rts-active-low property was active in the device tree.
-
-Fixes: 6d215f83e5fc ("serial: imx: warn user when using unsupported configuration")
-Cc: stable <stable@kernel.org>
-Signed-off-by: Stefan Eichenberger <stefan.eichenberger@toradex.com>
-Link: https://lore.kernel.org/r/20240621153829.183780-1-eichest@gmail.com
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/tty/serial/imx.c |    4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
---- a/drivers/tty/serial/imx.c
-+++ b/drivers/tty/serial/imx.c
-@@ -1954,8 +1954,10 @@ static int imx_uart_rs485_config(struct
-       /* Make sure Rx is enabled in case Tx is active with Rx disabled */
-       if (!(rs485conf->flags & SER_RS485_ENABLED) ||
--          rs485conf->flags & SER_RS485_RX_DURING_TX)
-+          rs485conf->flags & SER_RS485_RX_DURING_TX) {
-+              imx_uart_setup_ufcr(sport, TXTL_DEFAULT, RXTL_DEFAULT);
-               imx_uart_start_rx(port);
-+      }
-       port->rs485 = *rs485conf;
index fb6b586f27d2396d77e87096eac83bed958ecdf2..dd79fce31b6cec51a26a99e4d4a930c76cea4ffe 100644 (file)
@@ -194,7 +194,6 @@ pci-add-pci_error_response-and-related-definitions.patch
 x86-amd_nb-check-for-invalid-smn-reads.patch
 cifs-missed-ref-counting-smb-session-in-find.patch
 smb-client-fix-deadlock-in-smb2_find_smb_tcon.patch
-x86-mm-numa-use-numa_no_node-when-calling-memblock_s.patch
 acpi-add-quirks-for-amd-renoir-lucienne-cpus-to-forc.patch
 acpi-x86-add-a-quirk-for-dell-inspiron-14-2-in-1-for.patch
 acpi-x86-add-another-system-to-quirk-list-for-forcin.patch
@@ -256,7 +255,6 @@ usb-gadget-printer-fix-races-against-disable.patch
 usb-musb-da8xx-fix-a-resource-leak-in-probe.patch
 usb-atm-cxacru-fix-endpoint-checking-in-cxacru_bind.patch
 serial-8250_omap-implementation-of-errata-i2310.patch
-serial-imx-set-receiver-level-before-starting-uart.patch
 tty-mcf-mcf54418-has-10-uarts.patch
 net-can-j1939-initialize-unused-data-in-j1939_send_one.patch
 net-can-j1939-recover-socket-queue-on-can-bus-error-during-bam-transmission.patch
diff --git a/queue-5.10/x86-mm-numa-use-numa_no_node-when-calling-memblock_s.patch b/queue-5.10/x86-mm-numa-use-numa_no_node-when-calling-memblock_s.patch
deleted file mode 100644 (file)
index 6556084..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-From 3f3923f87ef0003550849db873edeef43cbaf941 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 29 May 2024 09:42:05 +0200
-Subject: x86/mm/numa: Use NUMA_NO_NODE when calling memblock_set_node()
-
-From: Jan Beulich <jbeulich@suse.com>
-
-[ Upstream commit 3ac36aa7307363b7247ccb6f6a804e11496b2b36 ]
-
-memblock_set_node() warns about using MAX_NUMNODES, see
-
-  e0eec24e2e19 ("memblock: make memblock_set_node() also warn about use of MAX_NUMNODES")
-
-for details.
-
-Reported-by: Narasimhan V <Narasimhan.V@amd.com>
-Signed-off-by: Jan Beulich <jbeulich@suse.com>
-Cc: stable@vger.kernel.org
-[bp: commit message]
-Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
-Reviewed-by: Mike Rapoport (IBM) <rppt@kernel.org>
-Tested-by: Paul E. McKenney <paulmck@kernel.org>
-Link: https://lore.kernel.org/r/20240603141005.23261-1-bp@kernel.org
-Link: https://lore.kernel.org/r/abadb736-a239-49e4-ab42-ace7acdd4278@suse.com
-Signed-off-by: Mike Rapoport (IBM) <rppt@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/x86/mm/numa.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
-index 62a119170376b..74a117cbbd3c9 100644
---- a/arch/x86/mm/numa.c
-+++ b/arch/x86/mm/numa.c
-@@ -523,7 +523,7 @@ static void __init numa_clear_kernel_node_hotplug(void)
-       for_each_reserved_mem_region(mb_region) {
-               int nid = memblock_get_region_node(mb_region);
--              if (nid != MAX_NUMNODES)
-+              if (nid != NUMA_NO_NODE)
-                       node_set(nid, reserved_nodemask);
-       }
-@@ -643,9 +643,9 @@ static int __init numa_init(int (*init_func)(void))
-       nodes_clear(node_online_map);
-       memset(&numa_meminfo, 0, sizeof(numa_meminfo));
-       WARN_ON(memblock_set_node(0, ULLONG_MAX, &memblock.memory,
--                                MAX_NUMNODES));
-+                                NUMA_NO_NODE));
-       WARN_ON(memblock_set_node(0, ULLONG_MAX, &memblock.reserved,
--                                MAX_NUMNODES));
-+                                NUMA_NO_NODE));
-       /* In case that parsing SRAT failed. */
-       WARN_ON(memblock_clear_hotplug(0, ULLONG_MAX));
-       numa_reset_distance();
--- 
-2.43.0
-
diff --git a/queue-5.15/serial-imx-set-receiver-level-before-starting-uart.patch b/queue-5.15/serial-imx-set-receiver-level-before-starting-uart.patch
deleted file mode 100644 (file)
index f899645..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-From a81dbd0463eca317eee44985a66aa6cc2ce5c101 Mon Sep 17 00:00:00 2001
-From: Stefan Eichenberger <stefan.eichenberger@toradex.com>
-Date: Fri, 21 Jun 2024 17:37:49 +0200
-Subject: serial: imx: set receiver level before starting uart
-
-From: Stefan Eichenberger <stefan.eichenberger@toradex.com>
-
-commit a81dbd0463eca317eee44985a66aa6cc2ce5c101 upstream.
-
-Set the receiver level to something > 0 before calling imx_uart_start_rx
-in rs485_config. This is necessary to avoid an interrupt storm that
-might prevent the system from booting. This was seen on an i.MX7 device
-when the rs485-rts-active-low property was active in the device tree.
-
-Fixes: 6d215f83e5fc ("serial: imx: warn user when using unsupported configuration")
-Cc: stable <stable@kernel.org>
-Signed-off-by: Stefan Eichenberger <stefan.eichenberger@toradex.com>
-Link: https://lore.kernel.org/r/20240621153829.183780-1-eichest@gmail.com
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/tty/serial/imx.c |    4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
---- a/drivers/tty/serial/imx.c
-+++ b/drivers/tty/serial/imx.c
-@@ -1972,8 +1972,10 @@ static int imx_uart_rs485_config(struct
-       /* Make sure Rx is enabled in case Tx is active with Rx disabled */
-       if (!(rs485conf->flags & SER_RS485_ENABLED) ||
--          rs485conf->flags & SER_RS485_RX_DURING_TX)
-+          rs485conf->flags & SER_RS485_RX_DURING_TX) {
-+              imx_uart_setup_ufcr(sport, TXTL_DEFAULT, RXTL_DEFAULT);
-               imx_uart_start_rx(port);
-+      }
-       port->rs485 = *rs485conf;
index 32c1f1ce3aa0f46e350aa5c519b38519e55d8426..7839e5bab4ecb318a73c5a96ae968d97d3d83be2 100644 (file)
@@ -252,7 +252,6 @@ perf-core-fix-missing-wakeup-when-waiting-for-contex.patch
 pci-add-pci_error_response-and-related-definitions.patch
 x86-amd_nb-check-for-invalid-smn-reads.patch
 smb-client-fix-deadlock-in-smb2_find_smb_tcon.patch
-x86-mm-numa-use-numa_no_node-when-calling-memblock_s.patch
 acpi-x86-utils-add-picasso-to-the-list-for-forcing-s.patch
 acpi-x86-force-storaged3enable-on-more-products.patch
 gve-add-rx-context.patch
@@ -320,7 +319,6 @@ usb-musb-da8xx-fix-a-resource-leak-in-probe.patch
 usb-atm-cxacru-fix-endpoint-checking-in-cxacru_bind.patch
 usb-dwc3-core-remove-lock-of-otg-mode-during-gadget-suspend-resume-to-avoid-deadlock.patch
 serial-8250_omap-implementation-of-errata-i2310.patch
-serial-imx-set-receiver-level-before-starting-uart.patch
 tty-mcf-mcf54418-has-10-uarts.patch
 net-can-j1939-initialize-unused-data-in-j1939_send_one.patch
 net-can-j1939-recover-socket-queue-on-can-bus-error-during-bam-transmission.patch
diff --git a/queue-5.15/x86-mm-numa-use-numa_no_node-when-calling-memblock_s.patch b/queue-5.15/x86-mm-numa-use-numa_no_node-when-calling-memblock_s.patch
deleted file mode 100644 (file)
index 3b566c5..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-From 4c108e2a4120d33de74e043cb98d505fc261dd3e Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 29 May 2024 09:42:05 +0200
-Subject: x86/mm/numa: Use NUMA_NO_NODE when calling memblock_set_node()
-
-From: Jan Beulich <jbeulich@suse.com>
-
-[ Upstream commit 3ac36aa7307363b7247ccb6f6a804e11496b2b36 ]
-
-memblock_set_node() warns about using MAX_NUMNODES, see
-
-  e0eec24e2e19 ("memblock: make memblock_set_node() also warn about use of MAX_NUMNODES")
-
-for details.
-
-Reported-by: Narasimhan V <Narasimhan.V@amd.com>
-Signed-off-by: Jan Beulich <jbeulich@suse.com>
-Cc: stable@vger.kernel.org
-[bp: commit message]
-Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
-Reviewed-by: Mike Rapoport (IBM) <rppt@kernel.org>
-Tested-by: Paul E. McKenney <paulmck@kernel.org>
-Link: https://lore.kernel.org/r/20240603141005.23261-1-bp@kernel.org
-Link: https://lore.kernel.org/r/abadb736-a239-49e4-ab42-ace7acdd4278@suse.com
-Signed-off-by: Mike Rapoport (IBM) <rppt@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/x86/mm/numa.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
-index 1a1c0c242f272..d074a1b4f976c 100644
---- a/arch/x86/mm/numa.c
-+++ b/arch/x86/mm/numa.c
-@@ -522,7 +522,7 @@ static void __init numa_clear_kernel_node_hotplug(void)
-       for_each_reserved_mem_region(mb_region) {
-               int nid = memblock_get_region_node(mb_region);
--              if (nid != MAX_NUMNODES)
-+              if (nid != NUMA_NO_NODE)
-                       node_set(nid, reserved_nodemask);
-       }
-@@ -642,9 +642,9 @@ static int __init numa_init(int (*init_func)(void))
-       nodes_clear(node_online_map);
-       memset(&numa_meminfo, 0, sizeof(numa_meminfo));
-       WARN_ON(memblock_set_node(0, ULLONG_MAX, &memblock.memory,
--                                MAX_NUMNODES));
-+                                NUMA_NO_NODE));
-       WARN_ON(memblock_set_node(0, ULLONG_MAX, &memblock.reserved,
--                                MAX_NUMNODES));
-+                                NUMA_NO_NODE));
-       /* In case that parsing SRAT failed. */
-       WARN_ON(memblock_clear_hotplug(0, ULLONG_MAX));
-       numa_reset_distance();
--- 
-2.43.0
-
diff --git a/queue-5.4/serial-imx-set-receiver-level-before-starting-uart.patch b/queue-5.4/serial-imx-set-receiver-level-before-starting-uart.patch
deleted file mode 100644 (file)
index 92f789a..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-From a81dbd0463eca317eee44985a66aa6cc2ce5c101 Mon Sep 17 00:00:00 2001
-From: Stefan Eichenberger <stefan.eichenberger@toradex.com>
-Date: Fri, 21 Jun 2024 17:37:49 +0200
-Subject: serial: imx: set receiver level before starting uart
-
-From: Stefan Eichenberger <stefan.eichenberger@toradex.com>
-
-commit a81dbd0463eca317eee44985a66aa6cc2ce5c101 upstream.
-
-Set the receiver level to something > 0 before calling imx_uart_start_rx
-in rs485_config. This is necessary to avoid an interrupt storm that
-might prevent the system from booting. This was seen on an i.MX7 device
-when the rs485-rts-active-low property was active in the device tree.
-
-Fixes: 6d215f83e5fc ("serial: imx: warn user when using unsupported configuration")
-Cc: stable <stable@kernel.org>
-Signed-off-by: Stefan Eichenberger <stefan.eichenberger@toradex.com>
-Link: https://lore.kernel.org/r/20240621153829.183780-1-eichest@gmail.com
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/tty/serial/imx.c |    4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
---- a/drivers/tty/serial/imx.c
-+++ b/drivers/tty/serial/imx.c
-@@ -1887,8 +1887,10 @@ static int imx_uart_rs485_config(struct
-       /* Make sure Rx is enabled in case Tx is active with Rx disabled */
-       if (!(rs485conf->flags & SER_RS485_ENABLED) ||
--          rs485conf->flags & SER_RS485_RX_DURING_TX)
-+          rs485conf->flags & SER_RS485_RX_DURING_TX) {
-+              imx_uart_setup_ufcr(sport, TXTL_DEFAULT, RXTL_DEFAULT);
-               imx_uart_start_rx(port);
-+      }
-       port->rs485 = *rs485conf;
index a145acc58a36363f10ed8c9ae2fe7048448de354..bc60a3c64d2cf8325e1538c8a439bc337b03fdb9 100644 (file)
@@ -166,7 +166,6 @@ net-usb-ax88179_178a-improve-link-status-logs.patch
 usb-gadget-printer-ss-support.patch
 usb-musb-da8xx-fix-a-resource-leak-in-probe.patch
 usb-atm-cxacru-fix-endpoint-checking-in-cxacru_bind.patch
-serial-imx-set-receiver-level-before-starting-uart.patch
 tty-mcf-mcf54418-has-10-uarts.patch
 net-can-j1939-initialize-unused-data-in-j1939_send_one.patch
 net-can-j1939-recover-socket-queue-on-can-bus-error-during-bam-transmission.patch
index e70ece8763f2c551d19e1d50851504b10cf2c957..93f9eb822dcaaa19c43b91b7f6806a5695300bc8 100644 (file)
@@ -1,6 +1,5 @@
 usb-typec-ucsi-never-send-a-lone-connector-change-ac.patch
 usb-typec-ucsi-ack-also-failed-get-error-commands.patch
-x86-mm-numa-use-numa_no_node-when-calling-memblock_s.patch
 acpi-x86-utils-add-picasso-to-the-list-for-forcing-s.patch
 acpi-x86-force-storaged3enable-on-more-products.patch
 input-ili210x-fix-ili251x_read_touch_data-return-val.patch
diff --git a/queue-6.1/x86-mm-numa-use-numa_no_node-when-calling-memblock_s.patch b/queue-6.1/x86-mm-numa-use-numa_no_node-when-calling-memblock_s.patch
deleted file mode 100644 (file)
index c284a08..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-From 0f98069fc8273f8e9bc04093ff8eea72bb0b2891 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 29 May 2024 09:42:05 +0200
-Subject: x86/mm/numa: Use NUMA_NO_NODE when calling memblock_set_node()
-
-From: Jan Beulich <jbeulich@suse.com>
-
-[ Upstream commit 3ac36aa7307363b7247ccb6f6a804e11496b2b36 ]
-
-memblock_set_node() warns about using MAX_NUMNODES, see
-
-  e0eec24e2e19 ("memblock: make memblock_set_node() also warn about use of MAX_NUMNODES")
-
-for details.
-
-Reported-by: Narasimhan V <Narasimhan.V@amd.com>
-Signed-off-by: Jan Beulich <jbeulich@suse.com>
-Cc: stable@vger.kernel.org
-[bp: commit message]
-Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
-Reviewed-by: Mike Rapoport (IBM) <rppt@kernel.org>
-Tested-by: Paul E. McKenney <paulmck@kernel.org>
-Link: https://lore.kernel.org/r/20240603141005.23261-1-bp@kernel.org
-Link: https://lore.kernel.org/r/abadb736-a239-49e4-ab42-ace7acdd4278@suse.com
-Signed-off-by: Mike Rapoport (IBM) <rppt@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/x86/mm/numa.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
-index c7fa5396c0f05..c281326baa144 100644
---- a/arch/x86/mm/numa.c
-+++ b/arch/x86/mm/numa.c
-@@ -523,7 +523,7 @@ static void __init numa_clear_kernel_node_hotplug(void)
-       for_each_reserved_mem_region(mb_region) {
-               int nid = memblock_get_region_node(mb_region);
--              if (nid != MAX_NUMNODES)
-+              if (nid != NUMA_NO_NODE)
-                       node_set(nid, reserved_nodemask);
-       }
-@@ -643,9 +643,9 @@ static int __init numa_init(int (*init_func)(void))
-       nodes_clear(node_online_map);
-       memset(&numa_meminfo, 0, sizeof(numa_meminfo));
-       WARN_ON(memblock_set_node(0, ULLONG_MAX, &memblock.memory,
--                                MAX_NUMNODES));
-+                                NUMA_NO_NODE));
-       WARN_ON(memblock_set_node(0, ULLONG_MAX, &memblock.reserved,
--                                MAX_NUMNODES));
-+                                NUMA_NO_NODE));
-       /* In case that parsing SRAT failed. */
-       WARN_ON(memblock_clear_hotplug(0, ULLONG_MAX));
-       numa_reset_distance();
--- 
-2.43.0
-