diff --git a/mm/memory.c b/mm/memory.c
index d4853970a7c104807337806a2d3b6a62adbd10fa..98c2872f841539fdb5f89a6e4df9a87b64c60872 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -4726,11 +4726,9 @@ static int clear_gigantic_page_chunk(unsigned long start, unsigned long end,
 	unsigned long i;
 
 	might_sleep();
-	for (i = start; i < end; ++i) {
+	for (i = start; i < end; i++, p = mem_map_next(p, base_page, i)) {
 		cond_resched();
 		clear_user_highpage(p, addr + i * PAGE_SIZE);
-
-		p = mem_map_next(p, base_page, i);
 	}
 
 	return KTASK_RETURN_SUCCESS;