diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index a235149d9406b2e48eb068087bd363610992194e..2793ce50f316d74be67c370c7c5670ba79c44ea5 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -3711,12 +3711,12 @@ void __ref build_all_zonelists(pg_data_t *pgdat, struct zone *zone)
 		mminit_verify_zonelist();
 		cpuset_init_current_mems_allowed();
 	} else {
-		/* we have to stop all cpus to guarantee there is no user
-		   of zonelist */
 #ifdef CONFIG_MEMORY_HOTPLUG
 		if (zone)
 			setup_zone_pageset(zone);
 #endif
+		/* we have to stop all cpus to guarantee there is no user
+		   of zonelist */
 		stop_machine(__build_all_zonelists, pgdat, NULL);
 		/* cpuset refresh routine should be here */
 	}