Merge tag 'v6.1.141' into toradex_ti-linux-6.1.y

This is the 6.1.141 stable release

Conflicts:
	drivers/spi/spi-cadence-quadspi.c

Signed-off-by: Emanuele Ghidoli <emanuele.ghidoli@toradex.com>

1 files changed, 8 insertions, 0 deletions

diff --git a/mm/migrate.c b/mm/migrate.c
index e37b18376714..7b986c9f4032 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -2422,6 +2422,14 @@ static int numamigrate_isolate_page(pg_data_t *pgdat, struct page *page)
 			if (managed_zone(pgdat->node_zones + z))
 				break;
 		}
+
+		/*
+		 * If there are no managed zones, it should not proceed
+		 * further.
+		 */
+		if (z < 0)
+			return 0;
+
 		wakeup_kswapd(pgdat->node_zones + z, 0, order, ZONE_MOVABLE);
 		return 0;
 	}